Merge "Composable Sahara services"

2 files changed, 62 insertions, 0 deletions

diff --git a/puppet/services/pacemaker/sahara-api.yaml b/puppet/services/pacemaker/sahara-api.yaml
new file mode 100644
index 00000000..a5db77c4
--- /dev/null
+++ b/puppet/services/pacemaker/sahara-api.yaml
@@ -0,0 +1,30 @@
+heat_template_version: 2016-04-08
+
+description: >
+  OpenStack Sahara API service with Pacemaker configured with Puppet
+
+parameters:
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
+
+resources:
+
+  SaharaApiBase:
+    type: ../sahara-api.yaml
+    properties:
+      EndpointMap: {get_param: EndpointMap}
+
+outputs:
+  role_data:
+    description: Role data for the Sahara API role.
+    value:
+      config_settings:
+        map_merge:
+          - get_attr: [SaharaApiBase, role_data, config_settings]
+          - sahara::service::api::manage_service: false
+            sahara::service::api::enabled: false
+      step_config: |
+        include ::tripleo::profile::pacemaker::sahara
diff --git a/puppet/services/pacemaker/sahara-engine.yaml b/puppet/services/pacemaker/sahara-engine.yaml
new file mode 100644
index 00000000..129f88bf
--- /dev/null
+++ b/puppet/services/pacemaker/sahara-engine.yaml
@@ -0,0 +1,32 @@
+heat_template_version: 2016-04-08
+
+description: >
+  OpenStack Sahara Engine service with Pacemaker configured with Puppet
+
+parameters:
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
+
+resources:
+
+  SaharaEngineBase:
+    type: ../sahara-engine.yaml
+    properties:
+      EndpointMap: {get_param: EndpointMap}
+
+outputs:
+  role_data:
+    description: Role data for the Sahara Engine role.
+    value:
+      config_settings:
+        map_merge:
+          - get_attr: [SaharaEngineBase, role_data, config_settings]
+          - sahara::service::engine::manage_service: false
+            sahara::service::engine::enabled: false
+      # No puppet manifests since sahara-engine is included in
+      # ::tripleo::profile::pacemaker::sahara which is maintained alongside of
+      # pacemaker/sahara-api.yaml.
+      step_config: