X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fsahara-base.yaml;h=c1ab8e8b8147106b3b1ad61de1b838eb6875fff7;hb=5d13a6397c4dccc78dc13c4bf23d651485868904;hp=7ec44a49d0fcd0d0cebf91ab2bdea6e98f83bf7d;hpb=22a8fab24af11d495d6d8adceb770482cdf57058;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/sahara-base.yaml b/puppet/services/sahara-base.yaml
index 7ec44a49..c1ab8e8b 100644
--- a/puppet/services/sahara-base.yaml
+++ b/puppet/services/sahara-base.yaml
@@ -4,6 +4,15 @@ description: >
   OpenStack Sahara base service. Shared for all Sahara services.
 
 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
@@ -53,7 +62,7 @@ outputs:
               - '/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::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
         sahara::db::mysql::dbname: sahara
         sahara::db::mysql::allowed_hosts:
           - '%'
@@ -68,8 +77,8 @@ outputs:
         sahara::identity_uri: { get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix] }
         sahara::use_neutron: true
         sahara::plugins:
+          - ambari
           - cdh
-          - hdp
           - mapr
           - vanilla
           - spark