From 2da8297c86c3965280db6a957b2fafb7c608ad82 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 23 Apr 2021 00:22:00 +0900 Subject: [PATCH] cinder: remove support for the Veritas HyperScale driver The Veritas HyperScale driver has been removed from cinder[1], thus we should remove its support from TripleO as well. [1] 9aca21f5cec8f03a3bb410acb21399955144fe0f Because the implementation was removed a while ago, this change doesn't deprecate the feature but directly remove it. Change-Id: I5dd448ac0a7c9a786b9239290d1690d51f50f71c --- ci/environments/scenario000-standalone.yaml | 1 - ...der-backend-veritas-hyperscale-puppet.yaml | 61 --------- ...yperscale-controller-baremetal-puppet.yaml | 127 ------------------ .../undercloud/undercloud-minion.yaml | 1 - .../cinder-veritas-hyperscale-config.yaml | 18 --- .../veritas-hyperscale-config.yaml | 32 ----- overcloud-resource-registry-puppet.j2.yaml | 2 - ...e-veritas-hyperscale-a0b5da7d882c853f.yaml | 12 ++ roles/BlockStorage.yaml | 1 - roles/Controller.yaml | 1 - roles/ControllerNoCeph.yaml | 1 - roles/ControllerNovaStandalone.yaml | 1 - roles/ControllerSriov.yaml | 1 - roles/ControllerStorageDashboard.yaml | 1 - roles/ControllerStorageNfs.yaml | 1 - roles/Standalone.yaml | 1 - roles_data.yaml | 2 - sample-env-generator/undercloud-minion.yaml | 1 - 18 files changed, 12 insertions(+), 253 deletions(-) delete mode 100644 deployment/cinder/cinder-backend-veritas-hyperscale-puppet.yaml delete mode 100644 deployment/veritas-hyperscale/veritas-hyperscale-controller-baremetal-puppet.yaml delete mode 100644 environments/veritas-hyperscale/cinder-veritas-hyperscale-config.yaml delete mode 100644 environments/veritas-hyperscale/veritas-hyperscale-config.yaml create mode 100644 releasenotes/notes/remove-veritas-hyperscale-a0b5da7d882c853f.yaml diff --git a/ci/environments/scenario000-standalone.yaml b/ci/environments/scenario000-standalone.yaml index c23adbd6e5..b384e05e3a 100644 --- a/ci/environments/scenario000-standalone.yaml +++ b/ci/environments/scenario000-standalone.yaml @@ -179,7 +179,6 @@ resource_registry: OS::TripleO::Services::Unbound: OS::Heat::None OS::TripleO::Services::UndercloudTLS: OS::Heat::None OS::TripleO::Services::UndercloudUpgrade: OS::Heat::None - OS::TripleO::Services::VRTSHyperScale: OS::Heat::None OS::TripleO::Services::Vpp: OS::Heat::None OS::TripleO::Services::Xinetd: OS::Heat::None OS::TripleO::Services::Zaqar: OS::Heat::None diff --git a/deployment/cinder/cinder-backend-veritas-hyperscale-puppet.yaml b/deployment/cinder/cinder-backend-veritas-hyperscale-puppet.yaml deleted file mode 100644 index 5aab2bcfdb..0000000000 --- a/deployment/cinder/cinder-backend-veritas-hyperscale-puppet.yaml +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright (c) 2017 Veritas Technologies LLC. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -heat_template_version: wallaby - -description: > - Openstack Veritas HyperScale backend - -parameters: - CinderVeritasHyperScaleAvailabilityZone: - default: '' - description: > - The availability zone of the Veritas HyperScale Cinder backend. - When set, it overrides the default CinderStorageAvailabilityZone. - type: string - 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. This - mapping overrides those in ServiceNetMapDefaults. - 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 Cinder Veritas HyperScale backend. - value: - service_name: cinder_backend_veritas_hyperscale - config_settings: - map_merge: - - tripleo::profile::base::cinder::volume::cinder_enable_vrts_hs_backend: true - - if: - - not: {equals : [{get_param: CinderVeritasHyperScaleAvailabilityZone}, '']} - - cinder::backend::veritas_hyperscale::backend_availability_zone: {get_param: CinderVeritasHyperScaleAvailabilityZone} diff --git a/deployment/veritas-hyperscale/veritas-hyperscale-controller-baremetal-puppet.yaml b/deployment/veritas-hyperscale/veritas-hyperscale-controller-baremetal-puppet.yaml deleted file mode 100644 index f06329cbf1..0000000000 --- a/deployment/veritas-hyperscale/veritas-hyperscale-controller-baremetal-puppet.yaml +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright (c) 2017 Veritas Technologies LLC. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -heat_template_version: wallaby - -description: > - Openstack Veritas HyperScale backend - -parameters: - VrtsRabbitPassword: - type: string - description: The Rabbitmq password of the hyperscale user. Mandatory. - VrtsKeystonePassword: - type: string - description: The Keystone password of the hyperscale service. Mandatory. - VrtsMysqlPassword: - type: string - description: The MySQL password of the hyperscale user. Mandatory. - VrtsCtrlMgmtIP: - type: string - default: '' - description: The management IP of HyperScale. The value will be inferred - from the rest of the deployment settings if left blank. - VrtsDashboardIP: - type: string - default: '' - description: The dashboard IP of HyperScale. The value will be inferred - from the rest of the deployment settings if left blank. - VrtsZookeeperIP: - type: string - description: The IP of a node where Zookeeper is configured. Mandatory. - VrtsSSHPassword: - type: string - description: The SSH password of the hyperscale user. Mandatory. - VrtsConfigParam1: - type: string - default: '' - description: Additional config parameter. Optional. - VrtsConfigParam2: - type: string - default: '' - description: Additional config parameter. Optional. - VrtsConfigParam3: - type: string - default: '' - description: Additional config parameter. Optional. - 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. This - mapping overrides those in ServiceNetMapDefaults. - 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. - KeystoneRegion: - type: string - default: 'regionOne' - description: Keystone region for endpoint - -outputs: - role_data: - description: Install Veritas HyperScale packages for controller. - value: - service_name: veritas_hyperscale_controller - config_settings: - global_config_settings: - vrts_ctrl_mgmt_ip: {get_param: VrtsCtrlMgmtIP} - vrts_dashboard_ip: {get_param: VrtsDashboardIP} - vrts_zookeeper_ip: {get_param: VrtsZookeeperIP} - vrts_ssh_passwd: {get_param: VrtsSSHPassword} - vrts_config_param1: {get_param: VrtsConfigParam1} - vrts_config_param2: {get_param: VrtsConfigParam2} - vrts_config_param3: {get_param: VrtsConfigParam3} - step_config: | - include ::veritas_hyperscale::controller_pkg_inst - service_config_settings: - rabbitmq: - vrts_rabbitmq_passwd: {get_param: VrtsRabbitPassword} - mysql: - vrts_mysql_passwd: {get_param: VrtsMysqlPassword} - keystone_resources: - hyperscale: - # Replicating what was done with Puppet manifest: - # https://github.com/vtas-hyperscale-ci/puppet-veritas_hyperscale/blob/7c7868adb027c5bcfdcb6fc9d86610470759ae28/manifests/hs_keystone.pp#L17 - # Moving forward, we should have the Veritas part of EndpointMap so the service - # can live outside of the Keystone node. - endpoints: - public: &veritas_endpoint - make_url: - scheme: {get_param: [EndpointMap, KeystoneAdmin, protocol]} - host: {get_param: [EndpointMap, KeystoneAdmin, host]} - port: 8753 - path: /v1/%(tenant_id)s - internal: *veritas_endpoint - admin: *veritas_endpoint - users: - hyperscale: - password: {get_param: VrtsKeystonePassword} - region: {get_param: KeystoneRegion} - service: 'infrastructure' - roles: - - infra_admin diff --git a/environments/undercloud/undercloud-minion.yaml b/environments/undercloud/undercloud-minion.yaml index a43fb7324f..e620d38186 100644 --- a/environments/undercloud/undercloud-minion.yaml +++ b/environments/undercloud/undercloud-minion.yaml @@ -288,7 +288,6 @@ resource_registry: OS::TripleO::Services::UndercloudMinionMessaging: ../../deployment/undercloud/minion-rabbitmq-puppet.yaml OS::TripleO::Services::UndercloudTLS: OS::Heat::None OS::TripleO::Services::UndercloudUpgrade: OS::Heat::None - OS::TripleO::Services::VRTSHyperScale: OS::Heat::None OS::TripleO::Services::Vpp: OS::Heat::None OS::TripleO::Services::Xinetd: OS::Heat::None OS::TripleO::Services::Zaqar: OS::Heat::None diff --git a/environments/veritas-hyperscale/cinder-veritas-hyperscale-config.yaml b/environments/veritas-hyperscale/cinder-veritas-hyperscale-config.yaml deleted file mode 100644 index 4cae7e871b..0000000000 --- a/environments/veritas-hyperscale/cinder-veritas-hyperscale-config.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2017 Veritas Technologies LLC. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# A Heat environment file which can be used to enable a -# a Veritas HyperScale backend, configured via puppet -resource_registry: - OS::TripleO::Services::CinderBackendVRTSHyperScale: ../../deployment/cinder/cinder-backend-veritas-hyperscale-puppet.yaml diff --git a/environments/veritas-hyperscale/veritas-hyperscale-config.yaml b/environments/veritas-hyperscale/veritas-hyperscale-config.yaml deleted file mode 100644 index 2fd4bf09e1..0000000000 --- a/environments/veritas-hyperscale/veritas-hyperscale-config.yaml +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright (c) 2017 Veritas Technologies LLC. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# A Heat environment file which can be used to install -# Veritas HyperScale packages for controller. -resource_registry: - # FIXME(bogdando): switch it, once it is containerized - OS::TripleO::Services::VRTSHyperScale: ../../deployment/veritas-hyperscale/veritas-hyperscale-controller-baremetal-puppet.yaml - -parameter_defaults: - EnablePackageInstall: true - VrtsRabbitPassword: '' - VrtsKeystonePassword: '' - VrtsMysqlPassword: '' - VrtsCtrlMgmtIP: '' - VrtsDashboardIP: '' - VrtsZookeeperIP: '' - VrtsSSHPassword: '' - VrtsConfigParam1: '' - VrtsConfigParam2: '' - VrtsConfigParam3: '' diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index bde6b0ea2d..57940117e4 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -282,7 +282,6 @@ resource_registry: OS::TripleO::Services::CinderBackendNetApp: OS::Heat::None OS::TripleO::Services::CinderBackendPure: OS::Heat::None OS::TripleO::Services::CinderBackendScaleIO: OS::Heat::None - OS::TripleO::Services::CinderBackendVRTSHyperScale: OS::Heat::None OS::TripleO::Services::CinderBackendNVMeOF: OS::Heat::None OS::TripleO::Services::CinderHPELeftHandISCSI: OS::Heat::None OS::TripleO::Services::CinderVolumeEdge: OS::Heat::None @@ -308,7 +307,6 @@ resource_registry: OS::TripleO::Services::Clustercheck: deployment/pacemaker/clustercheck-container-puppet.yaml OS::TripleO::Services::Rsyslog: OS::Heat::None OS::TripleO::Services::RsyslogSidecar: OS::Heat::None - OS::TripleO::Services::VRTSHyperScale: OS::Heat::None OS::TripleO::Services::LoginDefs: OS::Heat::None OS::TripleO::Services::ComputeInstanceHA: OS::Heat::None OS::TripleO::Services::DesignateApi: OS::Heat::None diff --git a/releasenotes/notes/remove-veritas-hyperscale-a0b5da7d882c853f.yaml b/releasenotes/notes/remove-veritas-hyperscale-a0b5da7d882c853f.yaml new file mode 100644 index 0000000000..28b2210886 --- /dev/null +++ b/releasenotes/notes/remove-veritas-hyperscale-a0b5da7d882c853f.yaml @@ -0,0 +1,12 @@ +--- +upgrade: + - | + The following two services have been removed, and should be removed from + role data during upgrade. + + - ``OS::TripleO::Services::CinderBackendVRTSHyperScale`` + - ``OS::TripleO::Services::VRTSHyperScale`` + +deprecations: + - | + Supoort for the Veritas HyperScale Driver has been removed. diff --git a/roles/BlockStorage.yaml b/roles/BlockStorage.yaml index 14953926ef..d60affe3f1 100644 --- a/roles/BlockStorage.yaml +++ b/roles/BlockStorage.yaml @@ -22,7 +22,6 @@ - OS::TripleO::Services::BlockStorageCinderVolume - OS::TripleO::Services::BootParams - OS::TripleO::Services::CACerts - - OS::TripleO::Services::CinderBackendVRTSHyperScale - OS::TripleO::Services::Collectd - OS::TripleO::Services::Frr - OS::TripleO::Services::IpaClient diff --git a/roles/Controller.yaml b/roles/Controller.yaml index cb83c6cfee..8cec296855 100644 --- a/roles/Controller.yaml +++ b/roles/Controller.yaml @@ -73,7 +73,6 @@ - OS::TripleO::Services::CinderBackendNetApp - OS::TripleO::Services::CinderBackendPure - OS::TripleO::Services::CinderBackendScaleIO - - OS::TripleO::Services::CinderBackendVRTSHyperScale - OS::TripleO::Services::CinderBackendNVMeOF - OS::TripleO::Services::CinderBackup - OS::TripleO::Services::CinderHPELeftHandISCSI diff --git a/roles/ControllerNoCeph.yaml b/roles/ControllerNoCeph.yaml index c562b9c8ec..8435a5e25a 100644 --- a/roles/ControllerNoCeph.yaml +++ b/roles/ControllerNoCeph.yaml @@ -61,7 +61,6 @@ - OS::TripleO::Services::CinderBackendNetApp - OS::TripleO::Services::CinderBackendPure - OS::TripleO::Services::CinderBackendScaleIO - - OS::TripleO::Services::CinderBackendVRTSHyperScale - OS::TripleO::Services::CinderBackendNVMeOF - OS::TripleO::Services::CinderBackup - OS::TripleO::Services::CinderHPELeftHandISCSI diff --git a/roles/ControllerNovaStandalone.yaml b/roles/ControllerNovaStandalone.yaml index 302c0e9f9e..c480db7ad4 100644 --- a/roles/ControllerNovaStandalone.yaml +++ b/roles/ControllerNovaStandalone.yaml @@ -55,7 +55,6 @@ - OS::TripleO::Services::CinderBackendNetApp - OS::TripleO::Services::CinderBackendPure - OS::TripleO::Services::CinderBackendScaleIO - - OS::TripleO::Services::CinderBackendVRTSHyperScale - OS::TripleO::Services::CinderBackup - OS::TripleO::Services::CinderHPELeftHandISCSI - OS::TripleO::Services::CinderScheduler diff --git a/roles/ControllerSriov.yaml b/roles/ControllerSriov.yaml index 12dbc83781..2c064abf75 100644 --- a/roles/ControllerSriov.yaml +++ b/roles/ControllerSriov.yaml @@ -65,7 +65,6 @@ - OS::TripleO::Services::CinderBackendNetApp - OS::TripleO::Services::CinderBackendPure - OS::TripleO::Services::CinderBackendScaleIO - - OS::TripleO::Services::CinderBackendVRTSHyperScale - OS::TripleO::Services::CinderBackendNVMeOF - OS::TripleO::Services::CinderBackup - OS::TripleO::Services::CinderHPELeftHandISCSI diff --git a/roles/ControllerStorageDashboard.yaml b/roles/ControllerStorageDashboard.yaml index 34e824c517..66b79d167c 100644 --- a/roles/ControllerStorageDashboard.yaml +++ b/roles/ControllerStorageDashboard.yaml @@ -71,7 +71,6 @@ - OS::TripleO::Services::CinderBackendNetApp - OS::TripleO::Services::CinderBackendPure - OS::TripleO::Services::CinderBackendScaleIO - - OS::TripleO::Services::CinderBackendVRTSHyperScale - OS::TripleO::Services::CinderBackendNVMeOF - OS::TripleO::Services::CinderBackup - OS::TripleO::Services::CinderHPELeftHandISCSI diff --git a/roles/ControllerStorageNfs.yaml b/roles/ControllerStorageNfs.yaml index 5a4a9e6fcf..f46cb604d6 100644 --- a/roles/ControllerStorageNfs.yaml +++ b/roles/ControllerStorageNfs.yaml @@ -72,7 +72,6 @@ - OS::TripleO::Services::CinderBackendNetApp - OS::TripleO::Services::CinderBackendPure - OS::TripleO::Services::CinderBackendScaleIO - - OS::TripleO::Services::CinderBackendVRTSHyperScale - OS::TripleO::Services::CinderBackendNVMeOF - OS::TripleO::Services::CinderBackup - OS::TripleO::Services::CinderHPELeftHandISCSI diff --git a/roles/Standalone.yaml b/roles/Standalone.yaml index ae01cbfc98..99d5b701db 100644 --- a/roles/Standalone.yaml +++ b/roles/Standalone.yaml @@ -69,7 +69,6 @@ - OS::TripleO::Services::CinderBackendPure - OS::TripleO::Services::CinderBackendNetApp - OS::TripleO::Services::CinderBackendScaleIO - - OS::TripleO::Services::CinderBackendVRTSHyperScale - OS::TripleO::Services::CinderBackup - OS::TripleO::Services::CinderHPELeftHandISCSI - OS::TripleO::Services::CinderScheduler diff --git a/roles_data.yaml b/roles_data.yaml index 1b91ac6459..e7b358d6a9 100644 --- a/roles_data.yaml +++ b/roles_data.yaml @@ -76,7 +76,6 @@ - OS::TripleO::Services::CinderBackendNetApp - OS::TripleO::Services::CinderBackendPure - OS::TripleO::Services::CinderBackendScaleIO - - OS::TripleO::Services::CinderBackendVRTSHyperScale - OS::TripleO::Services::CinderBackendNVMeOF - OS::TripleO::Services::CinderBackup - OS::TripleO::Services::CinderHPELeftHandISCSI @@ -292,7 +291,6 @@ - OS::TripleO::Services::BlockStorageCinderVolume - OS::TripleO::Services::BootParams - OS::TripleO::Services::CACerts - - OS::TripleO::Services::CinderBackendVRTSHyperScale - OS::TripleO::Services::Collectd - OS::TripleO::Services::Frr - OS::TripleO::Services::IpaClient diff --git a/sample-env-generator/undercloud-minion.yaml b/sample-env-generator/undercloud-minion.yaml index 1f586e7e5e..fc41a41a6f 100644 --- a/sample-env-generator/undercloud-minion.yaml +++ b/sample-env-generator/undercloud-minion.yaml @@ -274,7 +274,6 @@ environments: OS::TripleO::Services::UndercloudTLS: OS::Heat::None OS::TripleO::Services::UndercloudUpgrade: OS::Heat::None OS::TripleO::Services::Vpp: OS::Heat::None - OS::TripleO::Services::VRTSHyperScale: OS::Heat::None OS::TripleO::Services::Xinetd: OS::Heat::None OS::TripleO::Services::Zaqar: OS::Heat::None # Role specific dynamic parameters, to be defined here