Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "docker: add logging(source & groups)" into stable/pike
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
pacemaker
/
cinder-backup.yaml
diff --git
a/docker/services/pacemaker/cinder-backup.yaml
b/docker/services/pacemaker/cinder-backup.yaml
index
c2117c0
..
46b9932
100644
(file)
--- a/
docker/services/pacemaker/cinder-backup.yaml
+++ b/
docker/services/pacemaker/cinder-backup.yaml
@@
-85,6
+85,8
@@
outputs:
- 'pcmklatest'
cinder::backup::manage_service: false
cinder::backup::enabled: false
- 'pcmklatest'
cinder::backup::manage_service: false
cinder::backup::enabled: false
+ logging_source: {get_attr: [CinderBackupBase, role_data, logging_source]}
+ logging_groups: {get_attr: [CinderBackupBase, role_data, logging_groups]}
step_config: ""
service_config_settings: {get_attr: [CinderBackupBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
step_config: ""
service_config_settings: {get_attr: [CinderBackupBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
@@
-188,6
+190,9
@@
outputs:
resource: openstack-cinder-backup
state: disable
wait_for_resource: true
resource: openstack-cinder-backup
state: disable
wait_for_resource: true
+ register: output
+ retries: 5
+ until: output.rc == 0
when: is_bootstrap_node
- name: Delete the stopped openstack-cinder-backup cluster resource.
tags: step2
when: is_bootstrap_node
- name: Delete the stopped openstack-cinder-backup cluster resource.
tags: step2
@@
-195,6
+200,9
@@
outputs:
resource: openstack-cinder-backup
state: delete
wait_for_resource: true
resource: openstack-cinder-backup
state: delete
wait_for_resource: true
+ register: output
+ retries: 5
+ until: output.rc == 0
when: is_bootstrap_node
- name: Disable cinder_backup service
tags: step2
when: is_bootstrap_node
- name: Disable cinder_backup service
tags: step2