diff options
Diffstat (limited to 'docker/services/pacemaker/cinder-backup.yaml')
| -rw-r--r-- | docker/services/pacemaker/cinder-backup.yaml | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/docker/services/pacemaker/cinder-backup.yaml b/docker/services/pacemaker/cinder-backup.yaml index 4a99184f..52e54a6c 100644 --- a/docker/services/pacemaker/cinder-backup.yaml +++ b/docker/services/pacemaker/cinder-backup.yaml @@ -87,21 +87,34 @@ outputs: cinder::backup::enabled: false logging_source: {get_attr: [CinderBackupBase, role_data, logging_source]} logging_groups: {get_attr: [CinderBackupBase, role_data, logging_groups]} - step_config: "" + step_config: &step_config + list_join: + - "\n" + - - {get_attr: [CinderBackupBase, role_data, step_config]} + - {get_attr: [MySQLClient, role_data, step_config]} service_config_settings: {get_attr: [CinderBackupBase, role_data, service_config_settings]} # BEGIN DOCKER SETTINGS puppet_config: config_volume: cinder puppet_tags: cinder_config,file,concat,file_line - step_config: - list_join: - - "\n" - - - {get_attr: [CinderBackupBase, role_data, step_config]} - - {get_attr: [MySQLClient, role_data, step_config]} + step_config: *step_config config_image: {get_param: DockerCinderConfigImage} kolla_config: /var/lib/kolla/config_files/cinder_backup.json: command: /usr/bin/cinder-backup --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf + config_files: + - source: "/var/lib/kolla/config_files/src/*" + dest: "/" + merge: true + preserve_properties: true + - source: "/var/lib/kolla/config_files/src-ceph/" + dest: "/etc/ceph/" + merge: true + preserve_properties: true + - source: "/var/lib/kolla/config_files/src-iscsid/*" + dest: "/" + merge: true + preserve_properties: true permissions: - path: /var/lib/cinder owner: cinder:cinder @@ -176,6 +189,10 @@ outputs: with_items: - /var/lib/cinder - /var/log/containers/cinder + - name: ensure ceph configurations exist + file: + path: /etc/ceph + state: directory upgrade_tasks: - name: get bootstrap nodeid tags: common |