Add step0,validation checks for heat services

These are currently commented out because we were waiting for
I7612189be49c9c07f64753c1be4b72aa8524d06d to enable these in the
ci upgrades job.

Change-Id: I07bc0c2af0b227416470e23ad42f3a9aae430271
(cherry picked from commit 5d33537c0d27617a148784296483f92215c81adb)

diff --git a/puppet/services/heat-api-cfn.yaml b/puppet/services/heat-api-cfn.yaml
index 7bd2fcf..3ae4cc7 100644 (file)
--- a/puppet/services/heat-api-cfn.yaml
+++ b/puppet/services/heat-api-cfn.yaml
@@ -86,7 +86,7 @@ outputs:
               heat::keystone::auth_cfn::region: {get_param: KeystoneRegion}
       upgrade_tasks:
         - name: "PreUpgrade step0,validation: Check service openstack-heat-api-cfn is running"
-          shell: echo o/ #TODO uncomment when /#/c/423302/ : /usr/bin/systemctl show 'openstack-heat-api-cfn' --property ActiveState | grep '\bactive\b'
+          shell: /usr/bin/systemctl show 'openstack-heat-api-cfn' --property ActiveState | grep '\bactive\b'
           tags: step0,validation
         - name: Stop heat_api_cfn service
           tags: step2

diff --git a/puppet/services/heat-api-cloudwatch.yaml b/puppet/services/heat-api-cloudwatch.yaml
index 0954ad1..5618353 100644 (file)
--- a/puppet/services/heat-api-cloudwatch.yaml
+++ b/puppet/services/heat-api-cloudwatch.yaml
@@ -68,7 +68,7 @@ outputs:
         include ::tripleo::profile::base::heat::api_cloudwatch
       upgrade_tasks:
         - name: "PreUpgrade step0,validation: Check service openstack-heat-api-cloudwatch is running"
-          shell: echo o/ #TODO uncomment when /#/c/423302/ : /usr/bin/systemctl show 'openstack-heat-api-cloudwatch' --property ActiveState | grep '\bactive\b'
+          shell: /usr/bin/systemctl show 'openstack-heat-api-cloudwatch' --property ActiveState | grep '\bactive\b'
           tags: step0,validation
         - name: Stop heat_api_cloudwatch service
           tags: step2

diff --git a/puppet/services/heat-api.yaml b/puppet/services/heat-api.yaml
index ae656b1..38c5b47 100644 (file)
--- a/puppet/services/heat-api.yaml
+++ b/puppet/services/heat-api.yaml
@@ -86,7 +86,7 @@ outputs:
               heat::keystone::auth::region: {get_param: KeystoneRegion}
       upgrade_tasks:
         - name: "PreUpgrade step0,validation: Check service openstack-heat-api is running"
-          shell: echo o/ #TODO uncomment when /#/c/423302/ : /usr/bin/systemctl show 'openstack-heat-api' --property ActiveState | grep '\bactive\b'
+          shell: /usr/bin/systemctl show 'openstack-heat-api' --property ActiveState | grep '\bactive\b'
           tags: step0,validation
         - name: Stop heat_api service
           tags: step2

diff --git a/puppet/services/heat-engine.yaml b/puppet/services/heat-engine.yaml
index e85b753..8cb00eb 100644 (file)
--- a/puppet/services/heat-engine.yaml
+++ b/puppet/services/heat-engine.yaml
@@ -139,7 +139,7 @@ outputs:
             tripleo::profile::base::keystone::heat_admin_password: {get_param: HeatStackDomainAdminPassword}
       upgrade_tasks:
         - name: "PreUpgrade step0,validation: Check service openstack-heat-engine is running"
-          shell: echo o/ #TODO uncomment when /#/c/423302/ : /usr/bin/systemctl show 'openstack-heat-engine' --property ActiveState | grep '\bactive\b'
+          shell: /usr/bin/systemctl show 'openstack-heat-engine' --property ActiveState | grep '\bactive\b'
           tags: step0,validation
         - name: Stop heat_engine service
           tags: step2