From 56e2702f4a49f7ec1fe0ad537e449443e120eef6 Mon Sep 17 00:00:00 2001 From: rajinir Date: Tue, 28 Jul 2020 16:11:30 -0500 Subject: [PATCH] Support for PowerStore Cinder Backend Adding support for PowerStore Volume Backend Driver Depends-On: https://review.opendev.org/#/c/743627/ Change-Id: Idc36f3241b3ebed71722c6a89459c230beea4542 --- ...der-backend-dellemc-powerstore-puppet.yaml | 105 ++++++++++++++++++ .../cinder-dellemc-powerstore-config.yaml | 28 +++++ overcloud-resource-registry-puppet.j2.yaml | 1 + .../powerstore-driver-e528e372280c44e6.yaml | 6 + roles/Controller.yaml | 1 + roles/ControllerNoCeph.yaml | 1 + roles/ControllerNovaStandalone.yaml | 1 + roles/ControllerStorageDashboard.yaml | 1 + roles/ControllerStorageNfs.yaml | 1 + roles/Standalone.yaml | 1 + roles_data.yaml | 1 + 11 files changed, 147 insertions(+) create mode 100644 deployment/cinder/cinder-backend-dellemc-powerstore-puppet.yaml create mode 100644 environments/cinder-dellemc-powerstore-config.yaml create mode 100644 releasenotes/notes/powerstore-driver-e528e372280c44e6.yaml diff --git a/deployment/cinder/cinder-backend-dellemc-powerstore-puppet.yaml b/deployment/cinder/cinder-backend-dellemc-powerstore-puppet.yaml new file mode 100644 index 0000000000..2762715b50 --- /dev/null +++ b/deployment/cinder/cinder-backend-dellemc-powerstore-puppet.yaml @@ -0,0 +1,105 @@ +# Copyright (c) 2020 Dell Inc, or its subsidiaries. +# +# 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: rocky + +description: > + Openstack Cinder Dell EMC PowerStore backend + +parameters: + CinderEnablePowerStoreBackend: + type: boolean + default: true + CinderPowerStoreBackendName: + type: comma_delimited_list + default: 'tripleo_dellemc_powerstore' + description: A list of Cinder PowerStore Storage backend names. + CinderPowerStoreMultiConfig: + type: json + default: {} + description: > + Dictionary of settings when configuring multiple PowerStore backends. The + hash key is the backend name, and the value is a dictionary of parameter + values unique to that backend. + CinderPowerStoreAvailabilityZone: + default: '' + description: > + The availability zone of the Dell EMC PowerStore Cinder backend. + When set, it overrides the default CinderStorageAvailabilityZone. + type: string + CinderPowerStoreSanIp: + type: string + CinderPowerStoreSanLogin: + type: string + default: 'Admin' + CinderPowerStoreSanPassword: + type: string + hidden: true + CinderPowerStoreAppliances: + type: string + CinderPowerStorePorts: + type: string + default: '' + CinderPowerStoreStorageProtocol: + type: string + default: 'iSCSI' + constraints: + - allowed_values: [ 'iSCSI', 'FC'] + 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 + DefaultPasswords: + default: {} + 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 Dell EMC PowerStore backend. + value: + service_name: cinder_backend_dellemc_powerstore + config_settings: + map_merge: + - tripleo::profile::base::cinder::volume::cinder_enable_dellemc_powerstore_backend: {get_param: CinderEnablePowerStoreBackend} + cinder::backend::dellemc_powerstore::volume_backend_name: {get_param: CinderPowerStoreBackendName} + cinder::backend::dellemc_powerstore::volume_multi_config: {get_param: CinderPowerStoreMultiConfig} + cinder::backend::dellemc_powerstore::san_ip: {get_param: CinderPowerStoreSanIp} + cinder::backend::dellemc_powerstore::san_login: {get_param: CinderPowerStoreSanLogin} + cinder::backend::dellemc_powerstore::san_password: {get_param: CinderPowerStoreSanPassword} + cinder::backend::dellemc_powerstore::powerstore_appliances: {get_param: CinderPowerStoreAppliances} + cinder::backend::dellemc_powerstore::powerstore_ports: {get_param: CinderPowerStorePorts} + cinder::backend::dellemc_powerstore::storage_protocol: {get_param: CinderPowerStoreStorageProtocol} + - + if: + - {equals : [{get_param: CinderPowerStoreAvailabilityZone}, '']} + - {} + - cinder::backend::dellemc_powerstore::backend_availability_zone: {get_param: CinderPowerStoreAvailabilityZone} diff --git a/environments/cinder-dellemc-powerstore-config.yaml b/environments/cinder-dellemc-powerstore-config.yaml new file mode 100644 index 0000000000..46095091d6 --- /dev/null +++ b/environments/cinder-dellemc-powerstore-config.yaml @@ -0,0 +1,28 @@ +# A Heat environment file which can be used to enable a +# Cinder Dell EMC PowerMax backend, configured via puppet. +resource_registry: + OS::TripleO::Services::CinderBackendDellEMCPowerStore: ../deployment/cinder/cinder-backend-dellemc-powerstore-puppet.yaml + +parameter_defaults: + CinderEnablePowerStoreBackend: true + CinderPowerStoreBackendName: 'tripleo_dellemc_powerstore' + CinderPowerStoreMultiConfig: {} + CinderPowerStoreAvailabilityZone: '' + CinderPowerStoreSanIp: '' + CinderPowerStoreSanLogin: 'Admin' + CinderPowerStoreSanPassword: '' + CinderPowerStoreAppliances: '' + CinderPowerStorePorts: '' + CinderPowerStoreStorageProtocol: 'iSCSI' + +# To configure multiple PowerStore backends, use CinderPowerStoreMultiConfig to +# assign parameter values specific to that backend. For example: +# CinderPowerStoreBackendName: +# - tripleo_dellemc_powerstore_1 +# - tripleo_dellemc_powerstore_2 +# CinderPowerStoreMultiConfig: +# tripleo_dellemc_powerstore_1: +# CinderPowerStoreStorageProtocol: 'iSCSI' # Specific value for this backend +# tripleo_dellemc_powerstore_2: +# CinderPowerStoreStorageProtocol: 'FC' # Specific value for this backend + diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 873746238b..fa88997884 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -275,6 +275,7 @@ resource_registry: OS::TripleO::Services::CinderBackendDellSc: OS::Heat::None OS::TripleO::Services::CinderBackendDellEMCSc: OS::Heat::None OS::TripleO::Services::CinderBackendDellEMCPowermax: OS::Heat::None + OS::TripleO::Services::CinderBackendDellEMCPowerStore: OS::Heat::None OS::TripleO::Services::CinderBackendDellEMCUnity: OS::Heat::None OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI: OS::Heat::None OS::TripleO::Services::CinderBackendDellEMCVNX: OS::Heat::None diff --git a/releasenotes/notes/powerstore-driver-e528e372280c44e6.yaml b/releasenotes/notes/powerstore-driver-e528e372280c44e6.yaml new file mode 100644 index 0000000000..b32bca79ac --- /dev/null +++ b/releasenotes/notes/powerstore-driver-e528e372280c44e6.yaml @@ -0,0 +1,6 @@ +--- +features: + - Support for PowerStore backend cinder driver. + Supports both iSCSI and FC protocols + and support deploying one or multiple cinder + PowerStore storage backends. diff --git a/roles/Controller.yaml b/roles/Controller.yaml index 449dc62680..efcce74814 100644 --- a/roles/Controller.yaml +++ b/roles/Controller.yaml @@ -59,6 +59,7 @@ - OS::TripleO::Services::CinderApi - OS::TripleO::Services::CinderBackendDellSc - OS::TripleO::Services::CinderBackendDellEMCPowermax + - OS::TripleO::Services::CinderBackendDellEMCPowerStore - OS::TripleO::Services::CinderBackendDellEMCSc - OS::TripleO::Services::CinderBackendDellEMCUnity - OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI diff --git a/roles/ControllerNoCeph.yaml b/roles/ControllerNoCeph.yaml index 3e06f35049..1994ed37a8 100644 --- a/roles/ControllerNoCeph.yaml +++ b/roles/ControllerNoCeph.yaml @@ -51,6 +51,7 @@ - OS::TripleO::Services::CinderApi - OS::TripleO::Services::CinderBackendDellSc - OS::TripleO::Services::CinderBackendDellEMCPowermax + - OS::TripleO::Services::CinderBackendDellEMCPowerStore - OS::TripleO::Services::CinderBackendDellEMCSc - OS::TripleO::Services::CinderBackendDellEMCUnity - OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI diff --git a/roles/ControllerNovaStandalone.yaml b/roles/ControllerNovaStandalone.yaml index d5ed84f8ad..ec46d6b84b 100644 --- a/roles/ControllerNovaStandalone.yaml +++ b/roles/ControllerNovaStandalone.yaml @@ -44,6 +44,7 @@ - OS::TripleO::Services::CinderApi - OS::TripleO::Services::CinderBackendDellSc - OS::TripleO::Services::CinderBackendDellEMCPowermax + - OS::TripleO::Services::CinderBackendDellEMCPowerStore - OS::TripleO::Services::CinderBackendDellEMCSc - OS::TripleO::Services::CinderBackendDellEMCUnity - OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI diff --git a/roles/ControllerStorageDashboard.yaml b/roles/ControllerStorageDashboard.yaml index 249e3233f5..944bcc7a90 100644 --- a/roles/ControllerStorageDashboard.yaml +++ b/roles/ControllerStorageDashboard.yaml @@ -60,6 +60,7 @@ - OS::TripleO::Services::CinderApi - OS::TripleO::Services::CinderBackendDellSc - OS::TripleO::Services::CinderBackendDellEMCPowermax + - OS::TripleO::Services::CinderBackendDellEMCPowerStore - OS::TripleO::Services::CinderBackendDellEMCSc - OS::TripleO::Services::CinderBackendDellEMCUnity - OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI diff --git a/roles/ControllerStorageNfs.yaml b/roles/ControllerStorageNfs.yaml index 57d6bc24e6..386011567b 100644 --- a/roles/ControllerStorageNfs.yaml +++ b/roles/ControllerStorageNfs.yaml @@ -61,6 +61,7 @@ - OS::TripleO::Services::CinderApi - OS::TripleO::Services::CinderBackendDellSc - OS::TripleO::Services::CinderBackendDellEMCPowermax + - OS::TripleO::Services::CinderBackendDellEMCPowerStore - OS::TripleO::Services::CinderBackendDellEMCSc - OS::TripleO::Services::CinderBackendDellEMCUnity - OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI diff --git a/roles/Standalone.yaml b/roles/Standalone.yaml index 821bf87078..e1d8e7f5d0 100644 --- a/roles/Standalone.yaml +++ b/roles/Standalone.yaml @@ -50,6 +50,7 @@ - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::CinderApi - OS::TripleO::Services::CinderBackendDellEMCPowermax + - OS::TripleO::Services::CinderBackendDellEMCPowerStore - OS::TripleO::Services::CinderBackendDellEMCSc - OS::TripleO::Services::CinderBackendDellEMCUnity - OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI diff --git a/roles_data.yaml b/roles_data.yaml index 66190bc0d2..9c66f9986e 100644 --- a/roles_data.yaml +++ b/roles_data.yaml @@ -62,6 +62,7 @@ - OS::TripleO::Services::CinderApi - OS::TripleO::Services::CinderBackendDellSc - OS::TripleO::Services::CinderBackendDellEMCPowermax + - OS::TripleO::Services::CinderBackendDellEMCPowerStore - OS::TripleO::Services::CinderBackendDellEMCSc - OS::TripleO::Services::CinderBackendDellEMCUnity - OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI