Merge "Update parameters for cinder's Netapp backend"

deployment/cinder/cinder-backend-netapp-puppet.yaml

@@ -94,9 +94,13 @@ parameters:
     type: string
     default: ''
     hidden: true
-  CinderNetappStoragePools:
+  CinderNetappPoolNameSearchPattern:
+    default: '(.+)'
+    description: >
+      Regular expression that will be applied to the names of FlexVol volumes
+      in the Netapp backend that represent pools in Cinder. It may be used
+      to restrict provisioning to the specified FlexVol volumes.
     type: string
-    default: ''
   CinderNetappHostType:
     type: string
     default: ''
@@ -110,15 +114,15 @@ parameters:
     type: string
     default: 'false'
   # DEPRECATED options for compatibility with older versions
-  CinderNetappEseriesHostType:
+  CinderNetappStoragePools:
     type: string
-    default: 'linux_dm_mp'
+    default: ''
 
 parameter_groups:
 - label: deprecated
   description: Do not use deprecated params, they will be removed.
   parameters:
-  - CinderNetappEseriesHostType
+  - CinderNetappStoragePools
 
 outputs:
   role_data:
@@ -147,7 +151,6 @@ outputs:
             cinder::backend::netapp::netapp_copyoffload_tool_path: {get_param: CinderNetappCopyOffloadToolPath}
             cinder::backend::netapp::netapp_controller_ips: {get_param: CinderNetappControllerIps}
             cinder::backend::netapp::netapp_sa_password: {get_param: CinderNetappSaPassword}
-            cinder::backend::netapp::netapp_storage_pools: {get_param: CinderNetappStoragePools}
             cinder::backend::netapp::netapp_host_type: {get_param: CinderNetappHostType}
             cinder::backend::netapp::netapp_webservice_path: {get_param: CinderNetappWebservicePath}
             cinder::backend::netapp::nas_secure_file_operations: {get_param: CinderNetappNasSecureFileOperations}
@@ -157,3 +160,10 @@ outputs:
             - {equals : [{get_param: CinderNetappAvailabilityZone}, '']}
             - {}
             - cinder::backend::netapp::backend_availability_zone: {get_param: CinderNetappAvailabilityZone}
+          -
+            # Prefer CinderNetappPoolNameSearchPattern unless the (deprecated)
+            # CinderNetappStoragePools has a non-empty value.
+            if:
+            - {equals : [{get_param: CinderNetappStoragePools}, '']}
+            - cinder::backend::netapp::netapp_pool_name_search_pattern: {get_param: CinderNetappPoolNameSearchPattern}
+            - cinder::backend::netapp::netapp_storage_pools: {get_param: CinderNetappStoragePools}

environments/cinder-netapp-config.yaml

@@ -24,6 +24,6 @@ parameter_defaults:
   CinderNetappCopyOffloadToolPath: ''
   CinderNetappControllerIps: ''
   CinderNetappSaPassword: ''
-  CinderNetappStoragePools: ''
+  CinderNetappPoolNameSearchPattern: '(.+)'
   CinderNetappHostType: ''
   CinderNetappWebservicePath: '/devmgr/v2'

environments/storage/cinder-netapp-config.yaml

@@ -25,10 +25,6 @@ parameter_defaults:
   # Type: string
   CinderNetappCopyOffloadToolPath: ''
 
-  # 
-  # Type: string
-  CinderNetappEseriesHostType: linux_dm_mp
-
   # 
   # Type: string
   CinderNetappHostType: ''
@@ -67,6 +63,10 @@ parameter_defaults:
   # Type: string
   CinderNetappPassword: <None>
 
+  # Regular expression that will be applied to the names of FlexVol volumes in the Netapp backend that represent pools in Cinder. It may be used to restrict provisioning to the specified FlexVol volumes.
+  # Type: string
+  CinderNetappPoolNameSearchPattern: (.+)
+
   # 
   # Type: string
   CinderNetappSaPassword: ''
@@ -128,4 +128,4 @@ parameter_defaults:
   # End static parameters
   # *********************
 resource_registry:
-  OS::TripleO::Services::CinderBackendNetApp: ../deployment/cinder/cinder-backend-netapp-puppet.yaml
+  OS::TripleO::Services::CinderBackendNetApp: ../../deployment/cinder/cinder-backend-netapp-puppet.yaml

releasenotes/notes/update-cinder-netapp-parameters-cf6da846e72007df.yaml

@@ -0,0 +1,11 @@
+---
+features:
+  - |
+    Add new CinderNetappPoolNameSearchPattern parameter, which controls which
+    Netapp FlexVol volumes represent pools in Cinder.
+deprecations:
+  - |
+    The CinderNetappStoragePools parameter is deprecated in favor of the new
+    CinderNetappPoolNameSearchPattern parameter.
+    The previously deprecated CinderNetappEseriesHostType parameter has been
+    removed.

sample-env-generator/storage.yaml

@@ -68,4 +68,4 @@ environments:
     static:
       - CinderEnableNetappBackend
     resource_registry:
-      OS::TripleO::Services::CinderBackendNetApp: ../deployment/cinder/cinder-backend-netapp-puppet.yaml
+      OS::TripleO::Services::CinderBackendNetApp: ../../deployment/cinder/cinder-backend-netapp-puppet.yaml