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)

diff --git a/docker/services/ceilometer-agent-compute.yaml b/docker/services/ceilometer-agent-compute.yaml
index 535b169..a72f9bb 100644 (file)
--- 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