X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fsahara-api.yaml;h=85324312ee100b7fc7770dee8c0a52b6ee521f4c;hb=05691d25087e83066fbf5caadd022dca4c7131f2;hp=a0a98b178d5b4d12efa16a7b389de1fa05829549;hpb=f00ed98048a1a24e55dfea64171771ff73216335;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/sahara-api.yaml b/puppet/services/sahara-api.yaml
index a0a98b17..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,25 +25,28 @@ parameters:
 resources:
   SaharaBase:
     type: ./sahara-base.yaml
+    properties:
+      EndpointMap: {get_param: EndpointMap}
 
 outputs:
   role_data:
     description: Role data for the Sahara API role.
     value:
-      service_name: sahara-api
+      service_name: sahara_api
       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]}
             sahara::keystone::auth::password: {get_param: SaharaPassword }
             sahara::keystone::auth::region: {get_param: KeystoneRegion}
+            tripleo.sahara_api.firewall_rules:
+              '132 sahara':
+                dport:
+                  - 8386
+                  - 13386
       step_config: |
         include ::tripleo::profile::base::sahara::api