Composable firewall rules

[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 d28f40e..8f63ff6 100644 (file)
--- a/puppet/services/cinder-volume.yaml
+++ b/puppet/services/cinder-volume.yaml
@@ -36,6 +36,12 @@ parameters:
       NFS servers used by Cinder NFS backend. Effective when
       CinderEnableNfsBackend is true.
     type: comma_delimited_list
+  CinderRbdPoolName:
+    default: volumes
+    type: string
+  CephClientUserName:
+    default: openstack
+    type: string
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -53,6 +59,7 @@ outputs:
   role_data:
     description: Role data for the Cinder Volume role.
     value:
+      service_name: cinder-volume
       config_settings:
         map_merge:
           - get_attr: [CinderBase, role_data, config_settings]
@@ -67,5 +74,10 @@ outputs:
                   SERVERS: {get_param: CinderNfsServers}
             tripleo::profile::base::cinder::volume::iscsi::cinder_lvm_loop_device_size: {get_param: CinderLVMLoopDeviceSize}
             tripleo::profile::base::cinder::volume::iscsi::cinder_iscsi_helper: {get_param: CinderISCSIHelper}
+            tripleo::profile::base::cinder::volume::rbd::cinder_rbd_pool_name: {get_param: CinderRbdPoolName}
+            tripleo::profile::base::cinder::volume::rbd::cinder_rbd_user_name: {get_param: CephClientUserName}
+            tripleo.cinder_volume.firewall_rules:
+              '120 iscsi initiator':
+                dport: 3260
       step_config: |
         include ::tripleo::profile::base::cinder::volume