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

diff --git a/puppet/services/sahara-base.yaml b/puppet/services/sahara-base.yaml
index cbd76406..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
@@ -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