Merge "Move nova::db data within service template"

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

diff --git a/puppet/services/pacemaker/heat-api-cfn.yaml b/puppet/services/pacemaker/heat-api-cfn.yaml
index ba620f8..bf01ced 100644 (file)
--- a/puppet/services/pacemaker/heat-api-cfn.yaml
+++ b/puppet/services/pacemaker/heat-api-cfn.yaml
@@ -9,27 +9,22 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
-  MysqlVirtualIPUri:
-    type: string
-    default: ''
 
 resources:
   HeatApiCfnBase:
     type: ../heat-api-cfn.yaml
     properties:
       EndpointMap: {get_param: EndpointMap}
-      MysqlVirtualIPUri: {get_param: MysqlVirtualIPUri}
 
 outputs:
   role_data:
     description: Role data for the Heat CloudFormation API role.
     value:
+      service_name: heat-api-cfn
       config_settings:
         map_merge:
           - get_attr: [HeatApiCfnBase, role_data, config_settings]
           - heat::api_cfn::manage_service: false
             heat::api_cfn::enabled: false
-      step_config:
-        # No puppet manifests since heat-api-cfn is included in
-        # ::tripleo::profile::pacemaker::heat which is maintained alongside of
-        # pacemaker/heat-api.yaml.
+      step_config: |
+        include ::tripleo::profile::pacemaker::heat::api_cfn