Split Heat pacemaker roles into separate services

In order for each service to operate independently when used with Pacemaker,
the roles needed to be separated.

Change-Id: I0440b7b119fc9b7bb3db8a2bf341c0c6db8d3d33
Depends-On: I3fa76562c13191884a53848ad5adcbc9f5a24f61

diff --git a/puppet/services/pacemaker/heat-api-cfn.yaml b/puppet/services/pacemaker/heat-api-cfn.yaml
index 5833c42..780c295 100644 (file)
--- a/puppet/services/pacemaker/heat-api-cfn.yaml
+++ b/puppet/services/pacemaker/heat-api-cfn.yaml
@@ -25,7 +25,5 @@ outputs:
           - 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

diff --git a/puppet/services/pacemaker/heat-api-cloudwatch.yaml b/puppet/services/pacemaker/heat-api-cloudwatch.yaml
index 8b67702..2fa82fe 100644 (file)
--- a/puppet/services/pacemaker/heat-api-cloudwatch.yaml
+++ b/puppet/services/pacemaker/heat-api-cloudwatch.yaml
@@ -25,7 +25,5 @@ outputs:
            - get_attr: [HeatApiCloudwatchBase, role_data, config_settings]
            - heat::api_cloudwatch::manage_service: false
              heat::api_cloudwatch::enabled: false
-      step_config:
-        # No puppet manifests since heat-api-cloudwatch is included in
-        # ::tripleo::profile::pacemaker::heat which is maintained alongside of
-        # pacemaker/heat-api.yaml.
+      step_config: |
+        include ::tripleo::profile::pacemaker::heat::api_cloudwatch

diff --git a/puppet/services/pacemaker/heat-api.yaml b/puppet/services/pacemaker/heat-api.yaml
index 6628e8d..be897a5 100644 (file)
--- a/puppet/services/pacemaker/heat-api.yaml
+++ b/puppet/services/pacemaker/heat-api.yaml
@@ -26,4 +26,4 @@ outputs:
           - heat::api::manage_service: false
             heat::api::enabled: false
       step_config: |
-        include ::tripleo::profile::pacemaker::heat
+        include ::tripleo::profile::pacemaker::heat::api

diff --git a/puppet/services/pacemaker/heat-engine.yaml b/puppet/services/pacemaker/heat-engine.yaml
index e119578..a8ed5c0 100644 (file)
--- a/puppet/services/pacemaker/heat-engine.yaml
+++ b/puppet/services/pacemaker/heat-engine.yaml
@@ -26,7 +26,5 @@ outputs:
           - get_attr: [HeatEngineBase, role_data, config_settings]
           - heat::engine::manage_service: false
             heat::engine::enabled: false
-      step_config:
-        # No puppet manifests since heat-engine is included in
-        # ::tripleo::profile::pacemaker::heat which is maintained alongside of
-        # pacemaker/heat-api.yaml.
+      step_config: |
+        include ::tripleo::profile::pacemaker::heat::engine