5 files changed, 37 insertions, 37 deletions
diff --git a/puppet/services/pacemaker/sahara-api.yaml b/puppet/services/pacemaker/sahara-api.yaml
index ac05a01a..a06afb2d 100644
--- a/puppet/services/pacemaker/sahara-api.yaml
+++ b/puppet/services/pacemaker/sahara-api.yaml
@@ -28,4 +28,4 @@ outputs:
           - sahara::service::api::manage_service: false
             sahara::service::api::enabled: false
       step_config: |
-        include ::tripleo::profile::pacemaker::sahara
+        include ::tripleo::profile::pacemaker::sahara::api
diff --git a/puppet/services/pacemaker/sahara-engine.yaml b/puppet/services/pacemaker/sahara-engine.yaml
index f6bd8f61..a1191f87 100644
--- a/puppet/services/pacemaker/sahara-engine.yaml
+++ b/puppet/services/pacemaker/sahara-engine.yaml
@@ -27,7 +27,5 @@ outputs:
           - 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:
+      step_config: |
+        include ::tripleo::profile::pacemaker::sahara::engine
diff --git a/puppet/services/sahara-api.yaml b/puppet/services/sahara-api.yaml
index 7ca9bbd5..85324312 100644
--- a/puppet/services/sahara-api.yaml
+++ b/puppet/services/sahara-api.yaml
@@ -10,7 +10,6 @@ parameters:
                  via parameter_defaults in the resource registry.
     type: json
   SaharaPassword:
-    default: unset
     description: The password for the sahara service account, used by sahara-api.
     type: string
     hidden: true
@@ -18,9 +17,6 @@ parameters:
     default: 0
     description: The number of workers for the sahara-api.
     type: number
-  SaharaApiVirtualIP:
-    type: string
-    default: ''
   KeystoneRegion:
     type: string
     default: 'regionOne'
@@ -29,6 +25,8 @@ parameters:
 resources:
   SaharaBase:
     type: ./sahara-base.yaml
+    properties:
+      EndpointMap: {get_param: EndpointMap}
 
 outputs:
   role_data:
@@ -38,12 +36,8 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [SaharaBase, role_data, config_settings]
-          - sahara::host: {get_param: SaharaApiVirtualIP}
-            sahara::port: {get_param: [EndpointMap, SaharaInternal, port]}
-            sahara::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
-            sahara::identity_uri: { get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix] }
-            sahara::admin_password: {get_param: SaharaPassword}
-            sahara::service::api::api_workers: {get_param: SaharaApiWorkers}
+          - sahara::port: {get_param: [EndpointMap, SaharaInternal, port]}
+            sahara::service::api::api_workers: {get_param: SaharaWorkers}
             sahara::keystone::auth::public_url: {get_param: [EndpointMap, SaharaPublic, uri]}
             sahara::keystone::auth::internal_url: {get_param: [EndpointMap, SaharaInternal, uri]}
             sahara::keystone::auth::admin_url: {get_param: [EndpointMap, SaharaAdmin, uri]}
diff --git a/puppet/services/sahara-base.yaml b/puppet/services/sahara-base.yaml
index 2f8cd91b..7ec44a49 100644
--- a/puppet/services/sahara-base.yaml
+++ b/puppet/services/sahara-base.yaml
@@ -4,6 +4,11 @@ description: >
   OpenStack Sahara base service. Shared for all Sahara services.
 
 parameters:
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
   RabbitPassword:
     description: The password for RabbitMQ
     type: string
@@ -22,6 +27,10 @@ parameters:
     default: 5672
     description: Set rabbit subscriber port, change this if using SSL
     type: number
+  SaharaPassword:
+    description: The password for the sahara service account, used by sahara-api.
+    type: string
+    hidden: true
   Debug:
     type: string
     default: ''
@@ -33,11 +42,30 @@ outputs:
     value:
       service_name: sahara_base
       config_settings:
+        sahara::database_connection:
+          list_join:
+            - ''
+            - - {get_param: [EndpointMap, MysqlInternal, protocol]}
+              - '://sahara:'
+              - {get_param: SaharaPassword}
+              - '@'
+              - {get_param: [EndpointMap, MysqlInternal, host]}
+              - '/sahara'
+        sahara::db::mysql::password: {get_param: SaharaPassword}
+        sahara::db::mysql::user: sahara
+        sahara::db::mysql::host: {get_param: [EndpointMap, MysqlNoBracketsInternal, host]}
+        sahara::db::mysql::dbname: sahara
+        sahara::db::mysql::allowed_hosts:
+          - '%'
+          - "%{hiera('mysql_bind_host')}"
         sahara::rabbit_password: {get_param: RabbitPassword}
         sahara::rabbit_user: {get_param: RabbitUserName}
         sahara::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
         sahara::rabbit_port: {get_param: RabbitClientPort}
         sahara::debug: {get_param: Debug}
+        sahara::admin_password: {get_param: SaharaPassword}
+        sahara::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
+        sahara::identity_uri: { get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix] }
         sahara::use_neutron: true
         sahara::plugins:
           - cdh
diff --git a/puppet/services/sahara-engine.yaml b/puppet/services/sahara-engine.yaml
index 074f83c7..de2ac7ef 100644
--- a/puppet/services/sahara-engine.yaml
+++ b/puppet/services/sahara-engine.yaml
@@ -9,15 +9,12 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
-  SaharaPassword:
-    default: unset
-    description: The password for the sahara service account, used by sahara-api.
-    type: string
-    hidden: true
 
 resources:
   SaharaBase:
     type: ./sahara-base.yaml
+    properties:
+      EndpointMap: {get_param: EndpointMap}
 
 outputs:
   role_data:
@@ -27,22 +24,5 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [SaharaBase, role_data, config_settings]
-          - sahara_dsn: &sahara_dsn
-              list_join:
-                - ''
-                - - {get_param: [EndpointMap, MysqlInternal, protocol]}
-                  - '://sahara:'
-                  - {get_param: SaharaPassword}
-                  - '@'
-                  - {get_param: [EndpointMap, MysqlInternal, host]}
-                  - '/sahara'
-            sahara::database_connection: *sahara_dsn
-            sahara::db::mysql::password: {get_param: SaharaPassword}
-            sahara::db::mysql::user: sahara
-            sahara::db::mysql::host: {get_param: [EndpointMap, MysqlNoBracketsInternal, host]}
-            sahara::db::mysql::dbname: sahara
-            sahara::db::mysql::allowed_hosts:
-              - '%'
-              - "%{hiera('mysql_bind_host')}"
       step_config: |
         include ::tripleo::profile::base::sahara::engine