aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-09-11 17:49:26 +0000
committerGerrit Code Review <review@openstack.org>2017-09-11 17:49:26 +0000
commite73c84ad5685df4cdca70d9ad255635de2cf63f7 (patch)
treebbcb90669efd9dda1b263099b8b7bdeedb980208 /docker
parentdeb1f8cd49c0efde0c4c66d6812b1a15262248c4 (diff)
parent485fc6d65e75d65c400599699dab7624894f2c1d (diff)
Merge "Add defaults for ceilometer-agent-compute upgrade tasks" into stable/pike
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 c800b44..90b30d4 100644
--- a/docker/services/ceilometer-agent-compute.yaml
+++ b/docker/services/ceilometer-agent-compute.yaml
@@ -105,14 +105,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