Manila: Remove support for Dell EMC VMAX share driver

VMAX was rebranded to PowerMax and the old driver was deprecated. Because current TripleO supports the new PowerMax share driver and the configurations for old VMAX driver is known to be broken, this removes support for the VMAX share driver. Change-Id: I8031f6c66dd1feae303e7b2c3eeddfb8b532c676
2022-08-25 15:08:09 +09:00 · 2022-08-25 15:08:09 +09:00 · 506b6f79fc
parent f3fc38f412
commit 506b6f79fc
20 changed files with 8 additions and 113 deletions
--- a/ci/custom_ci_roles_data.yaml
+++ b/ci/custom_ci_roles_data.yaml
@ -120,7 +120,6 @@
    - OS::TripleO::Services::ManilaBackendPowerMax
    - OS::TripleO::Services::ManilaBackendUnity
    - OS::TripleO::Services::ManilaBackendVNX
-    - OS::TripleO::Services::ManilaBackendVMAX
    - OS::TripleO::Services::ManilaScheduler
    - OS::TripleO::Services::ManilaShare
    - OS::TripleO::Services::Memcached
--- a/ci/environments/scenario000-standalone.yaml
+++ b/ci/environments/scenario000-standalone.yaml
@ -89,7 +89,6 @@ resource_registry:
  OS::TripleO::Services::ManilaBackendNetapp: OS::Heat::None
  OS::TripleO::Services::ManilaBackendPowerMax: OS::Heat::None
  OS::TripleO::Services::ManilaBackendUnity: OS::Heat::None
-  OS::TripleO::Services::ManilaBackendVMAX: OS::Heat::None
  OS::TripleO::Services::ManilaBackendVNX: OS::Heat::None
  OS::TripleO::Services::ManilaScheduler: OS::Heat::None
  OS::TripleO::Services::ManilaShare: OS::Heat::None
--- a/deployment/manila/manila-backend-vmax.yaml
+++ b/deployment/manila/manila-backend-vmax.yaml
@ -1,77 +0,0 @@
-heat_template_version: wallaby
-
-description: >
-  Openstack Manila vmax backend.
-
-parameters:
-  ManilaVMAXBackendName:
-    type: string
-    default: tripleo_manila_vmax
-  ManilaVMAXAvailabilityZone:
-    default: ''
-    description: >
-      The availability zone of the VMAX backend.
-      When set, it overrides the default ManilaStorageAvailabilityZone.
-    type: string
-  ManilaVMAXNasLogin:
-    type: string
-    default: ''
-  ManilaVMAXNasPassword:
-    type: string
-    default: ''
-    hidden: true
-  ManilaVMAXNasServer:
-    type: string
-    default: ''
-  ManilaVMAXServerContainer:
-    type: string
-    default: ''
-  ManilaVMAXShareDataPools:
-    type: comma_delimited_list
-    default: []
-  ManilaVMAXEthernetPorts:
-    type: comma_delimited_list
-    default: []
-  ServiceData:
-    default: {}
-    description: Dictionary packing service data
-    type: json
-  ServiceNetMap:
-    default: {}
-    description: Mapping of service_name -> network name. Typically set
-                 via parameter_defaults in the resource registry. Use
-                 parameter_merge_strategies to merge it with the defaults.
-    type: json
-  RoleName:
-    default: ''
-    description: Role name on which the service is applied
-    type: string
-  RoleParameters:
-    default: {}
-    description: Parameters specific to the role
-    type: json
-  EndpointMap:
-    default: {}
-    type: json
-    description: Mapping of service endpoint -> protocol. Typically set
-                 via parameter_defaults in the resource registry.
-
-outputs:
-  role_data:
-    description: Role data for the Manila VMAX backend.
-    value:
-      service_name: manila_backend_vmax
-      config_settings:
-        map_merge:
-          - manila::backend::dellemc_vmax::title: {get_param: ManilaVMAXBackendName}
-            manila::backend::dellemc_vmax::emc_nas_login: {get_param: ManilaVMAXNasLogin}
-            manila::backend::dellemc_vmax::emc_nas_password: {get_param: ManilaVMAXNasPassword}
-            manila::backend::dellemc_vmax::emc_nas_server: {get_param: ManilaVMAXNasServer}
-            manila::backend::dellemc_vmax::emc_share_backend: vmax
-            manila::backend::dellemc_vmax::vmax_server_container: {get_param: ManilaVMAXServerContainer}
-            manila::backend::dellemc_vmax::vmax_share_data_pools: {get_param: ManilaVMAXShareDataPools}
-            manila::backend::dellemc_vmax::vmax_ethernet_ports: {get_param: ManilaVMAXEthernetPorts}
-          - if:
-              - { equals: [ { get_param: ManilaVMAXAvailabilityZone }, '' ] }
-              - { }
-              - manila::backend::dellemc_vmax::backend_availability_zone: { get_param: ManilaVMAXAvailabilityZone }
--- a/environments/manila-vmax-config.yaml
+++ b/environments/manila-vmax-config.yaml
@ -1,18 +0,0 @@
-# This environment file enables Manila with the VMAX backend.
-resource_registry:
-  OS::TripleO::Services::ManilaApi: ../deployment/manila/manila-api-container-puppet.yaml
-  OS::TripleO::Services::ManilaScheduler: ../deployment/manila/manila-scheduler-container-puppet.yaml
-  # Only manila-share is pacemaker managed:
-  OS::TripleO::Services::ManilaShare: ../deployment/manila/manila-share-pacemaker-puppet.yaml
-  OS::TripleO::Services::ManilaBackendVMAX: ../deployment/manila/manila-backend-vmax.yaml
-
-parameter_defaults:
-  ManilaVMAXBackendName: tripleo_manila_vmax
-  ManilaVMAXNasLogin: ''
-  ManilaVMAXNasPassword: ''
-  ManilaVMAXNasServer: ''
-  ManilaVMAXServerContainer: ''
-  ManilaVMAXShareDataPools: ''
-  ManilaVMAXEthernetPorts: ''
-
-
--- a/environments/standalone/standalone-overcloud.yaml
+++ b/environments/standalone/standalone-overcloud.yaml
@ -85,7 +85,6 @@ resource_registry:
  OS::TripleO::Services::ManilaBackendNetapp: OS::Heat::None
  OS::TripleO::Services::ManilaBackendPowerMax: OS::Heat::None
  OS::TripleO::Services::ManilaBackendUnity: OS::Heat::None
-  OS::TripleO::Services::ManilaBackendVMAX: OS::Heat::None
  OS::TripleO::Services::ManilaBackendVNX: OS::Heat::None
  OS::TripleO::Services::ManilaScheduler: OS::Heat::None
  OS::TripleO::Services::ManilaShare: OS::Heat::None
--- a/environments/standalone/standalone-tripleo.yaml
+++ b/environments/standalone/standalone-tripleo.yaml
@ -95,7 +95,6 @@ resource_registry:
  OS::TripleO::Services::ManilaBackendNetapp: OS::Heat::None
  OS::TripleO::Services::ManilaBackendPowerMax: OS::Heat::None
  OS::TripleO::Services::ManilaBackendUnity: OS::Heat::None
-  OS::TripleO::Services::ManilaBackendVMAX: OS::Heat::None
  OS::TripleO::Services::ManilaBackendVNX: OS::Heat::None
  OS::TripleO::Services::ManilaScheduler: OS::Heat::None
  OS::TripleO::Services::ManilaShare: OS::Heat::None
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@ -223,7 +223,6 @@ resource_registry:
  OS::TripleO::Services::ManilaBackendNetapp: OS::Heat::None
  OS::TripleO::Services::ManilaBackendPowerMax: OS::Heat::None
  OS::TripleO::Services::ManilaBackendUnity: OS::Heat::None
-  OS::TripleO::Services::ManilaBackendVMAX: OS::Heat::None
  OS::TripleO::Services::ManilaBackendCephFs: OS::Heat::None
  OS::TripleO::Services::ManilaBackendVNX: OS::Heat::None
  OS::TripleO::Services::ComputeNeutronL3Agent: OS::Heat::None
--- a/releasenotes/notes/remove-manila-vmax-61c1559fd3e58642.yaml
+++ b/releasenotes/notes/remove-manila-vmax-61c1559fd3e58642.yaml
@ -0,0 +1,8 @@
+---
+upgrade:
+  - |
+    Support for the Dell EMC VMAX share driver has been removed.
+
+  - |
+    The ``OS::TripleO::Services::ManilaBackendVMAX`` service should be removed
+    from role data during upgrade.
--- a/roles/Controller.yaml
+++ b/roles/Controller.yaml
@ -119,7 +119,6 @@
    - OS::TripleO::Services::ManilaBackendPowerMax
    - OS::TripleO::Services::ManilaBackendUnity
    - OS::TripleO::Services::ManilaBackendVNX
-    - OS::TripleO::Services::ManilaBackendVMAX
    - OS::TripleO::Services::ManilaScheduler
    - OS::TripleO::Services::ManilaShare
    - OS::TripleO::Services::Memcached
--- a/roles/ControllerAllNovaStandalone.yaml
+++ b/roles/ControllerAllNovaStandalone.yaml
@ -87,7 +87,6 @@
    - OS::TripleO::Services::ManilaBackendPowerMax
    - OS::TripleO::Services::ManilaBackendUnity
    - OS::TripleO::Services::ManilaBackendVNX
-    - OS::TripleO::Services::ManilaBackendVMAX
    - OS::TripleO::Services::ManilaScheduler
    - OS::TripleO::Services::ManilaShare
    - OS::TripleO::Services::Memcached
--- a/roles/ControllerNoCeph.yaml
+++ b/roles/ControllerNoCeph.yaml
@ -107,7 +107,6 @@
    - OS::TripleO::Services::ManilaBackendPowerMax
    - OS::TripleO::Services::ManilaBackendUnity
    - OS::TripleO::Services::ManilaBackendVNX
-    - OS::TripleO::Services::ManilaBackendVMAX
    - OS::TripleO::Services::ManilaScheduler
    - OS::TripleO::Services::ManilaShare
    - OS::TripleO::Services::Memcached
--- a/roles/ControllerNovaStandalone.yaml
+++ b/roles/ControllerNovaStandalone.yaml
@ -109,7 +109,6 @@
    - OS::TripleO::Services::ManilaBackendPowerMax
    - OS::TripleO::Services::ManilaBackendUnity
    - OS::TripleO::Services::ManilaBackendVNX
-    - OS::TripleO::Services::ManilaBackendVMAX
    - OS::TripleO::Services::ManilaScheduler
    - OS::TripleO::Services::ManilaShare
    - OS::TripleO::Services::Memcached
--- a/roles/ControllerOpenstack.yaml
+++ b/roles/ControllerOpenstack.yaml
@ -93,7 +93,6 @@
    - OS::TripleO::Services::ManilaBackendPowerMax
    - OS::TripleO::Services::ManilaBackendUnity
    - OS::TripleO::Services::ManilaBackendVNX
-    - OS::TripleO::Services::ManilaBackendVMAX
    - OS::TripleO::Services::ManilaScheduler
    - OS::TripleO::Services::ManilaShare
    - OS::TripleO::Services::MetricsQdr
--- a/roles/ControllerSriov.yaml
+++ b/roles/ControllerSriov.yaml
@ -116,7 +116,6 @@
    - OS::TripleO::Services::ManilaBackendPowerMax
    - OS::TripleO::Services::ManilaBackendUnity
    - OS::TripleO::Services::ManilaBackendVNX
-    - OS::TripleO::Services::ManilaBackendVMAX
    - OS::TripleO::Services::ManilaScheduler
    - OS::TripleO::Services::ManilaShare
    - OS::TripleO::Services::Memcached
--- a/roles/ControllerStorageDashboard.yaml
+++ b/roles/ControllerStorageDashboard.yaml
@ -118,7 +118,6 @@
    - OS::TripleO::Services::ManilaBackendPowerMax
    - OS::TripleO::Services::ManilaBackendUnity
    - OS::TripleO::Services::ManilaBackendVNX
-    - OS::TripleO::Services::ManilaBackendVMAX
    - OS::TripleO::Services::ManilaScheduler
    - OS::TripleO::Services::ManilaShare
    - OS::TripleO::Services::Memcached
--- a/roles/ControllerStorageNfs.yaml
+++ b/roles/ControllerStorageNfs.yaml
@ -118,7 +118,6 @@
    - OS::TripleO::Services::ManilaBackendPowerMax
    - OS::TripleO::Services::ManilaBackendUnity
    - OS::TripleO::Services::ManilaBackendVNX
-    - OS::TripleO::Services::ManilaBackendVMAX
    - OS::TripleO::Services::ManilaScheduler
    - OS::TripleO::Services::ManilaShare
    - OS::TripleO::Services::Memcached
--- a/roles/Standalone.yaml
+++ b/roles/Standalone.yaml
@ -116,7 +116,6 @@
    - OS::TripleO::Services::ManilaBackendNetapp
    - OS::TripleO::Services::ManilaBackendPowerMax
    - OS::TripleO::Services::ManilaBackendUnity
-    - OS::TripleO::Services::ManilaBackendVMAX
    - OS::TripleO::Services::ManilaBackendVNX
    - OS::TripleO::Services::ManilaScheduler
    - OS::TripleO::Services::ManilaShare
--- a/roles_data.yaml
+++ b/roles_data.yaml
@ -122,7 +122,6 @@
    - OS::TripleO::Services::ManilaBackendPowerMax
    - OS::TripleO::Services::ManilaBackendUnity
    - OS::TripleO::Services::ManilaBackendVNX
-    - OS::TripleO::Services::ManilaBackendVMAX
    - OS::TripleO::Services::ManilaScheduler
    - OS::TripleO::Services::ManilaShare
    - OS::TripleO::Services::Memcached
--- a/roles_data_standalone.yaml
+++ b/roles_data_standalone.yaml
@ -117,7 +117,6 @@
    - OS::TripleO::Services::ManilaBackendNetapp
    - OS::TripleO::Services::ManilaBackendPowerMax
    - OS::TripleO::Services::ManilaBackendUnity
-    - OS::TripleO::Services::ManilaBackendVMAX
    - OS::TripleO::Services::ManilaBackendVNX
    - OS::TripleO::Services::ManilaScheduler
    - OS::TripleO::Services::ManilaShare
--- a/sample-env-generator/standalone.yaml
+++ b/sample-env-generator/standalone.yaml
@ -111,7 +111,6 @@ environments:
      OS::TripleO::Services::ManilaBackendNetapp: OS::Heat::None
      OS::TripleO::Services::ManilaBackendPowerMax: OS::Heat::None
      OS::TripleO::Services::ManilaBackendUnity: OS::Heat::None
-      OS::TripleO::Services::ManilaBackendVMAX: OS::Heat::None
      OS::TripleO::Services::ManilaBackendVNX: OS::Heat::None
      OS::TripleO::Services::ManilaScheduler: OS::Heat::None
      OS::TripleO::Services::ManilaShare: OS::Heat::None
@ -211,7 +210,6 @@ environments:
      OS::TripleO::Services::ManilaBackendNetapp: OS::Heat::None
      OS::TripleO::Services::ManilaBackendPowerMax: OS::Heat::None
      OS::TripleO::Services::ManilaBackendUnity: OS::Heat::None
-      OS::TripleO::Services::ManilaBackendVMAX: OS::Heat::None
      OS::TripleO::Services::ManilaBackendVNX: OS::Heat::None
      OS::TripleO::Services::ManilaScheduler: OS::Heat::None
      OS::TripleO::Services::ManilaShare: OS::Heat::None