aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorMarius Cornea <mcornea@redhat.com>2017-09-07 10:56:29 +0200
committerMarius Cornea <mcornea@redhat.com>2017-09-11 12:46:18 +0000
commit485fc6d65e75d65c400599699dab7624894f2c1d (patch)
tree3645165d2ee8adf1138334a50b2143f2b08b9605 /docker
parent39bb4cf3e960cbbe3390175b230aa32a5d795a4c (diff)
Add defaults for ceilometer-agent-compute upgrade tasks
This change allows the upgrade non controller script, which loops throug all steps, to complete by adding default values to be evaluated in the steps where the vars are not registered. Closes-Bug: 1715574 Change-Id: Ic056fc556240d1acc9f28a75f63c7628cc64da03 (cherry picked from commit d109c1d7a7d2f6302c39369de8a601bc0b2f6704)
Diffstat (limited to 'docker')
-rw-r--r--docker/services/ceilometer-agent-compute.yaml6
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/services/ceilometer-agent-compute.yaml b/docker/services/ceilometer-agent-compute.yaml
index 535b169..a72f9bb 100644
--- a/docker/services/ceilometer-agent-compute.yaml
+++ b/docker/services/ceilometer-agent-compute.yaml
@@ -99,14 +99,14 @@ outputs:
register: openstack_ceilometer_compute_enabled
- name: Check if openstack-ceilometer-polling is deployed
command: systemctl is-enabled openstack-ceilometer-polling
- tags: step2
+ tags: step2
ignore_errors: True
register: openstack_ceilometer_polling_enabled
- name: Stop and disable ceilometer compute agent
tags: step2
service: name=openstack-ceilometer-compute state=stopped enabled=no
- when: openstack_ceilometer_compute_enabled.rc == 0
+ when: openstack_ceilometer_compute_enabled.rc|default('') == 0
- name: Stop and disable ceilometer polling agent
tags: step2
service: name=openstack-ceilometer-polling state=stopped enabled=no
- when: openstack_ceilometer_polling_enabled.rc == 0
+ when: openstack_ceilometer_polling_enabled.rc|default('') == 0