Merge "Support for multiple Cinder Dell EMC Unity storage backends"

deployment/cinder/cinder-backend-dellemc-unity-puppet.yaml

@@ -21,8 +21,16 @@ parameters:
     type: boolean
     default: true
   CinderDellEMCUnityBackendName:
-    type: string
+    type: comma_delimited_list
     default: 'tripleo_dellemc_unity'
+    description: A list of Cinder Dell EMC Unity backend names.
+  CinderDellEMCUnityMultiConfig:
+    type: json
+    default: {}
+    description: >
+      Dictionary of settings when configuring multiple Dell EMC Unity backends.
+      The hash key is the backend name, and the value is a dictionary of
+      parameter values unique to that backend.
   CinderDellEMCUnityAvailabilityZone:
     default: ''
     description: >
@@ -79,6 +87,7 @@ outputs:
         map_merge:
           - tripleo::profile::base::cinder::volume::cinder_enable_dellemc_unity_backend: {get_param: CinderEnableDellEMCUnityBackend}
             cinder::backend::dellemc_unity::volume_backend_name: {get_param: CinderDellEMCUnityBackendName}
+            cinder::backend::dellemc_unity::volume_multi_config: {get_param: CinderDellEMCUnityMultiConfig}
             cinder::backend::dellemc_unity::san_ip: {get_param: CinderDellEMCUnitySanIp}
             cinder::backend::dellemc_unity::san_login: {get_param: CinderDellEMCUnitySanLogin}
             cinder::backend::dellemc_unity::san_password: {get_param: CinderDellEMCUnitySanPassword}

environments/cinder-dellemc-unity-config.yaml

@@ -6,9 +6,23 @@ resource_registry:
 parameter_defaults:
   CinderEnableDellEMCUnityBackend: true
   CinderDellEMCUnityBackendName: 'tripleo_dellemc_unity'
+  CinderDellEMCUnityMultiConfig: {}
   CinderDellEMCUnitySanIp: ''
   CinderDellEMCUnitySanLogin: 'Admin'
   CinderDellEMCUnitySanPassword: ''
   CinderDellEMCUnityStorageProtocol: 'iSCSI'
   CinderDellEMCUnityIoPorts: ''
   CinderDellEMCUnityStoragePoolNames: ''
+
+# To configure multiple Dell EMC Unity backends, use CinderDellEMCUnityMultiConfig to
+# assign parameter values specific to that backend. For example:
+#   CinderDellEMCUnityBackendName:
+#     - tripleo_dellemc_unity_1
+#     - tripleo_dellemc_unity_2
+#   CinderDellEMCUnityMultiConfig:
+#     tripleo_dellemc_unity_1:
+#       CinderDellEMCUnityStoragePoolNames: 'pool1'
+#     tripleo_dellemc_unity_2:
+#       CinderDellEMCUnitySanIp: '192.0.2.10'
+#       CinderDellEMCUnitySanLogin: 'root'
+#       CinderDellEMCUnitySanPassword: 'xyz'

releasenotes/notes/cinder-multiple-dellemc_unity-backends-96c6d2764209e317.yaml

@@ -0,0 +1,7 @@
+---
+features:
+  - |
+    Support deploying multiple Cinder Dell EMC Unity storage backends.
+    CinderDellEMCUnityBackendName is enhanced to support a list of backend names,
+    and a new ``CinderDellEMCUnityMultiConfig`` parameter provides a way to
+    specify parameter values for each backend.