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

diff --git a/puppet/services/sahara-base.yaml b/puppet/services/sahara-base.yaml
index c1ab8e8b..e2084186 100644
--- a/puppet/services/sahara-base.yaml
+++ b/puppet/services/sahara-base.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2016-04-08
+heat_template_version: ocata
 
 description: >
   OpenStack Sahara base service. Shared for all Sahara services.
@@ -44,6 +44,10 @@ parameters:
     type: string
     default: ''
     description: Set to True to enable debugging on all services.
+  SaharaPlugins:
+    default: ["ambari","cdh","mapr","vanilla","spark","storm"]
+    description: Sahara enabled plugin list
+    type: comma_delimited_list
 
 outputs:
   role_data:
@@ -60,13 +64,8 @@ outputs:
               - '@'
               - {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, MysqlInternal, host_nobrackets]}
-        sahara::db::mysql::dbname: sahara
-        sahara::db::mysql::allowed_hosts:
-          - '%'
-          - "%{hiera('mysql_bind_host')}"
+              - '?bind_address='
+              - "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
         sahara::rabbit_password: {get_param: RabbitPassword}
         sahara::rabbit_user: {get_param: RabbitUserName}
         sahara::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
@@ -74,17 +73,10 @@ outputs:
         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::identity_uri: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
         sahara::use_neutron: true
-        sahara::plugins:
-          - ambari
-          - cdh
-          - mapr
-          - vanilla
-          - spark
-          - storm
+        sahara::plugins: {get_param: SaharaPlugins}
         sahara::rpc_backend: rabbit
         sahara::admin_tenant_name: 'service'
-        sahara::keystone::auth::tenant: 'service'
         sahara::db::database_db_max_retries: -1
         sahara::db::database_max_retries: -1