diff --git a/rpc_deployment/playbooks/openstack/openstack-setup.yml b/rpc_deployment/playbooks/openstack/openstack-setup.yml index 7fc306e539..3ea6f3da82 100644 --- a/rpc_deployment/playbooks/openstack/openstack-setup.yml +++ b/rpc_deployment/playbooks/openstack/openstack-setup.yml @@ -23,4 +23,5 @@ - include: cinder-all.yml - include: horizon-all.yml - include: utility.yml +- include: rpc-support.yml - include: ../infrastructure/rsyslog-config.yml diff --git a/rpc_deployment/playbooks/rpc_support.yml b/rpc_deployment/playbooks/openstack/rpc-support.yml similarity index 100% rename from rpc_deployment/playbooks/rpc_support.yml rename to rpc_deployment/playbooks/openstack/rpc-support.yml diff --git a/rpc_deployment/playbooks/setup/containers-setup.yml b/rpc_deployment/playbooks/setup/containers-setup.yml index 398d93b164..5faee6110c 100644 --- a/rpc_deployment/playbooks/setup/containers-setup.yml +++ b/rpc_deployment/playbooks/setup/containers-setup.yml @@ -24,4 +24,5 @@ container_groups: "{{ groups[container_group|default(default_container_groups)] }}" required_container_config_options: - "lxc.mount.entry=/openstack/log/{{ hostvars[item]['container_name'] }} var/log/{{ hostvars[item]['service_name'] }} none defaults,bind,rw 0 0" + - "lxc.mount.entry=/openstack/backup/{{ hostvars[item]['container_name'] }} var/backup none defaults,bind,rw 0 0" - "lxc.mount.entry=/openstack/monitoring monitoring none defaults,bind,rw 0 0" diff --git a/rpc_deployment/roles/container_setup/tasks/main.yml b/rpc_deployment/roles/container_setup/tasks/main.yml index 0bbcc2e89b..252f5ef950 100644 --- a/rpc_deployment/roles/container_setup/tasks/main.yml +++ b/rpc_deployment/roles/container_setup/tasks/main.yml @@ -81,14 +81,16 @@ command=attach container_command="mkdir -p {{ item.0 }}" with_nested: - - [ "/monitoring", "/etc/network/interfaces.d" ] + - [ "/monitoring", "/etc/network/interfaces.d", "/var/backup" ] - container_groups - name: Create Required local log directories file: > - path=/openstack/log/{{ hostvars[item]['container_name'] }} + path="{{ item.0 }}/{{ hostvars[item.1]['container_name'] }}" state=directory - with_items: container_groups + with_nested: + - [ "/openstack/backup", "/openstack/log" ] + - container_groups - name: Create Required local monitoring directories file: > diff --git a/rpc_deployment/roles/rpc_support_holland/tasks/holland.yml b/rpc_deployment/roles/rpc_support_holland/tasks/holland.yml index b03e416cd8..c24ae020a0 100644 --- a/rpc_deployment/roles/rpc_support_holland/tasks/holland.yml +++ b/rpc_deployment/roles/rpc_support_holland/tasks/holland.yml @@ -81,7 +81,7 @@ state: directory path: "{{ item }}" with_items: - - "/var/lib/mysql/holland_backups" + - "/var/backup/holland_backups" - "/etc/holland" tags: - holland_dir diff --git a/rpc_deployment/roles/rpc_support_holland/templates/holland.conf.j2 b/rpc_deployment/roles/rpc_support_holland/templates/holland.conf.j2 index 5effeac0ed..3e38e2658e 100644 --- a/rpc_deployment/roles/rpc_support_holland/templates/holland.conf.j2 +++ b/rpc_deployment/roles/rpc_support_holland/templates/holland.conf.j2 @@ -5,7 +5,7 @@ plugin_dirs = /usr/share/holland/plugins ## Top level directory where backups are held -backup_directory = /var/lib/mysql/holland_backups +backup_directory = /var/backup/holland_backups ## List of enabled backup sets. Can be comma separated. ## Read from /backupsets/.conf @@ -20,7 +20,7 @@ path = /usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin [logging] ## where to write the log -filename = /var/log/mysql/holland.log +filename = /var/log/backup/holland_backups/holland.log ## debug, info, warning, error, critical (case insensitive) level = info