Merge "Add docker zaqar service"

[apex-tripleo-heat-templates.git] / puppet / services / heat-api-cfn.yaml

diff --git a/puppet/services/heat-api-cfn.yaml b/puppet/services/heat-api-cfn.yaml
index 1a86ec7..3ae4cc7 100644 (file)
--- a/puppet/services/heat-api-cfn.yaml
+++ b/puppet/services/heat-api-cfn.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2016-04-08
+heat_template_version: ocata
 
 description: >
   Openstack Heat CloudFormation API service configured with Puppet
@@ -76,9 +76,18 @@ outputs:
         include ::tripleo::profile::base::heat::api_cfn
       service_config_settings:
         keystone:
-          heat::keystone::auth_cfn::tenant: 'service'
-          heat::keystone::auth_cfn::public_url: {get_param: [EndpointMap, HeatCfnPublic, uri]}
-          heat::keystone::auth_cfn::internal_url: {get_param: [EndpointMap, HeatCfnInternal, uri]}
-          heat::keystone::auth_cfn::admin_url: {get_param: [EndpointMap, HeatCfnAdmin, uri]}
-          heat::keystone::auth_cfn::password: {get_param: HeatPassword}
-          heat::keystone::auth_cfn::region: {get_param: KeystoneRegion}
+          map_merge:
+            - get_attr: [HeatBase, role_data, service_config_settings, keystone]
+            - heat::keystone::auth_cfn::tenant: 'service'
+              heat::keystone::auth_cfn::public_url: {get_param: [EndpointMap, HeatCfnPublic, uri]}
+              heat::keystone::auth_cfn::internal_url: {get_param: [EndpointMap, HeatCfnInternal, uri]}
+              heat::keystone::auth_cfn::admin_url: {get_param: [EndpointMap, HeatCfnAdmin, uri]}
+              heat::keystone::auth_cfn::password: {get_param: HeatPassword}
+              heat::keystone::auth_cfn::region: {get_param: KeystoneRegion}
+      upgrade_tasks:
+        - name: "PreUpgrade step0,validation: Check service openstack-heat-api-cfn is running"
+          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
+          service: name=openstack-heat-api-cfn state=stopped