openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Manila: Remove support for Dell EMC VMAX share driver"

Browse Source
This commit is contained in:
Zuul 2023-01-04 00:54:00 +00:00 committed by Gerrit Code Review
commit 8b2ef21d62
20 changed files with 8 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ci/custom_ci_roles_data.yaml
View File

@ -121,7 +121,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

1
ci/environments/scenario000-standalone.yaml
View File

@ -90,7 +90,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

77
deployment/manila/manila-backend-vmax.yaml
View File

@ -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 }

18
environments/manila-vmax-config.yaml
View File

@ -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: ''

1
environments/standalone/standalone-overcloud.yaml
View File

@ -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

1
environments/standalone/standalone-tripleo.yaml
View File

@ -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

1
overcloud-resource-registry-puppet.j2.yaml
View File

@ -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

8
releasenotes/notes/remove-manila-vmax-61c1559fd3e58642.yaml Normal file
View File

@ -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.

1
roles/Controller.yaml
View File

@ -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

1
roles/ControllerAllNovaStandalone.yaml
View File

@ -88,7 +88,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

1
roles/ControllerNoCeph.yaml
View File

@ -108,7 +108,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

1
roles/ControllerNovaStandalone.yaml
View File

@ -110,7 +110,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

1
roles/ControllerOpenstack.yaml
View File

@ -94,7 +94,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

1
roles/ControllerSriov.yaml
View File

@ -117,7 +117,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

1
roles/ControllerStorageDashboard.yaml
View File

@ -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

1
roles/ControllerStorageNfs.yaml
View File

@ -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

1
roles/Standalone.yaml
View File

@ -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

1
roles_data.yaml
View File

@ -123,7 +123,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

1
roles_data_standalone.yaml
View File

@ -120,7 +120,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

2
sample-env-generator/standalone.yaml
View File

@ -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