Merge "Pass cinder_iscsi_address without brackets"

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

diff --git a/puppet/services/cinder-volume.yaml b/puppet/services/cinder-volume.yaml
index 8f63ff6..5451afd 100644 (file)
--- a/puppet/services/cinder-volume.yaml
+++ b/puppet/services/cinder-volume.yaml
@@ -42,6 +42,15 @@ parameters:
   CephClientUserName:
     default: openstack
     type: string
+  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
@@ -53,13 +62,15 @@ resources:
   CinderBase:
     type: ./cinder-base.yaml
     properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
 
 outputs:
   role_data:
     description: Role data for the Cinder Volume role.
     value:
-      service_name: cinder-volume
+      service_name: cinder_volume
       config_settings:
         map_merge:
           - get_attr: [CinderBase, role_data, config_settings]
@@ -79,5 +90,11 @@ outputs:
             tripleo.cinder_volume.firewall_rules:
               '120 iscsi initiator':
                 dport: 3260
+            # 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
+            tripleo::profile::base::cinder::volume::iscsi::cinder_iscsi_address: {get_param: [ServiceNetMap, CinderIscsiNetwork]}
       step_config: |
         include ::tripleo::profile::base::cinder::volume