X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fpacemaker%2Fsahara-api.yaml;h=3dfb7d94bedc85ee52af61333312094686f5a781;hb=4ad03b75c5bb6b0c4a1760796f2b57a65b05eb59;hp=a5db77c4ab78938e3858f9c0a14e9d002b31fcf7;hpb=71ede867ae281413d1ddd24d07867f34d32a76fa;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/pacemaker/sahara-api.yaml b/puppet/services/pacemaker/sahara-api.yaml
index a5db77c4..3dfb7d94 100644
--- a/puppet/services/pacemaker/sahara-api.yaml
+++ b/puppet/services/pacemaker/sahara-api.yaml
@@ -4,6 +4,15 @@ description: >
   OpenStack Sahara API service with Pacemaker configured with Puppet
 
 parameters:
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    type: json
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -15,16 +24,22 @@ resources:
   SaharaApiBase:
     type: ../sahara-api.yaml
     properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
 
 outputs:
   role_data:
     description: Role data for the Sahara API role.
     value:
+      service_name: sahara_api
+      monitoring_subscription: {get_attr: [SaharaApiBase, role_data, monitoring_subscription]}
+      logging_source: {get_attr: [SaharaApiBase, role_data, logging_source]}
+      logging_groups: {get_attr: [SaharaApiBase, role_data, logging_groups]}
       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
+        include ::tripleo::profile::pacemaker::sahara::api