Fix Flavor get_param for Block Storage.

[apex-tripleo-heat-templates.git] / puppet / services / sahara-api.yaml

diff --git a/puppet/services/sahara-api.yaml b/puppet/services/sahara-api.yaml
index 93bf738..5715a8c 100644 (file)
--- a/puppet/services/sahara-api.yaml
+++ b/puppet/services/sahara-api.yaml
@@ -4,13 +4,21 @@ description: >
   OpenStack Sahara API service 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
                  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 +26,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,24 +34,30 @@ parameters:
 resources:
   SaharaBase:
     type: ./sahara-base.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
       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