Specify the Ceph packages to be installed

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

diff --git a/puppet/services/cinder-api.yaml b/puppet/services/cinder-api.yaml
index 3568cb0..94c94a6 100644 (file)
--- a/puppet/services/cinder-api.yaml
+++ b/puppet/services/cinder-api.yaml
@@ -13,6 +13,15 @@ parameters:
     description: The password for the cinder service account, used by cinder-api.
     type: string
     hidden: true
+  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
@@ -22,12 +31,17 @@ parameters:
     type: string
     default: 'regionOne'
     description: Keystone region for endpoint
+  MonitoringSubscriptionCinderApi:
+    default: 'overcloud-cinder-api'
+    type: string
 
 resources:
 
   CinderBase:
     type: ./cinder-base.yaml
     properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
 
 outputs:
@@ -35,6 +49,7 @@ outputs:
     description: Role data for the Cinder API role.
     value:
       service_name: cinder_api
+      monitoring_subscription: {get_param: MonitoringSubscriptionCinderApi}
       config_settings:
         map_merge:
           - get_attr: [CinderBase, role_data, config_settings]
@@ -67,5 +82,11 @@ outputs:
                 dport:
                   - 8776
                   - 13776
+            # NOTE: bind IP is found in Heat replacing the network name with the local node IP
+            # for the given network; replacement examples (eg. for internal_api):
+            # internal_api -> IP
+            # internal_api_uri -> [IP]
+            # internal_api_subnet - > IP/CIDR
+            cinder::api::bind_host: {get_param: [ServiceNetMap, CinderApiNetwork]}
       step_config: |
         include ::tripleo::profile::base::cinder::api