Browse Source

Merge "Remove Dell EMC PS Series Driver support"

tags/12.3.0
Zuul 3 months ago
committed by Gerrit Code Review
parent
commit
1359df37a0
11 changed files with 5 additions and 151 deletions
  1. +0
    -111
      deployment/cinder/cinder-backend-dellps-puppet.yaml
  2. +0
    -32
      environments/cinder-dellps-config.yaml
  3. +0
    -1
      overcloud-resource-registry-puppet.j2.yaml
  4. +5
    -0
      releasenotes/notes/cinder-remove-dell-ps-fce96d05f529d0da.yaml
  5. +0
    -1
      roles/Controller.yaml
  6. +0
    -1
      roles/ControllerNoCeph.yaml
  7. +0
    -1
      roles/ControllerNovaStandalone.yaml
  8. +0
    -1
      roles/ControllerStorageDashboard.yaml
  9. +0
    -1
      roles/ControllerStorageNfs.yaml
  10. +0
    -1
      roles/Standalone.yaml
  11. +0
    -1
      roles_data.yaml

+ 0
- 111
deployment/cinder/cinder-backend-dellps-puppet.yaml View File

@@ -1,111 +0,0 @@
# Copyright (c) 2017 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 PS Series backend

parameters:
CinderEnableDellPsBackend:
type: boolean
default: true
CinderDellPsBackendName:
type: string
default: 'tripleo_dellps'
CinderDellPsAvailabilityZone:
default: ''
description: >
The availability zone of the Dell PS Cinder backend.
When set, it overrides the default CinderStorageAvailabilityZone.
type: string
CinderDellPsSanIp:
type: string
CinderDellPsSanLogin:
type: string
CinderDellPsSanPassword:
type: string
hidden: true
CinderDellPsSanPrivateKey:
type: string
default: ''
CinderDellPsSanThinProvision:
type: boolean
default: true
CinderDellPsGroupname:
type: string
default: 'group-0'
CinderDellPsPool:
type: string
default: 'default'
CinderDellPsChapLogin:
type: string
default: ''
CinderDellPsChapPassword:
type: string
default: ''
CinderDellPsUseChap:
type: boolean
default: false
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 PS Series backend.
value:
service_name: cinder_backend_dellps
config_settings:
map_merge:
- tripleo::profile::base::cinder::volume::cinder_enable_dellps_backend: {get_param: CinderEnableDellPsBackend}
cinder::backend::eqlx::volume_backend_name: {get_param: CinderDellPsBackendName}
cinder::backend::eqlx::san_ip: {get_param: CinderDellPsSanIp}
cinder::backend::eqlx::san_login: {get_param: CinderDellPsSanLogin}
cinder::backend::eqlx::san_password: {get_param: CinderDellPsSanPassword}
cinder::backend::eqlx::san_private_key: {get_param: CinderDellPsSanPrivateKey}
cinder::backend::eqlx::san_thin_provision: {get_param: CinderDellPsSanThinProvision}
cinder::backend::eqlx::eqlx_group_name: {get_param: CinderDellPsGroupname}
cinder::backend::eqlx::eqlx_pool: {get_param: CinderDellPsPool}
cinder::backend::eqlx::eqlx_use_chap: {get_param: CinderDellPsUseChap}
cinder::backend::eqlx::eqlx_chap_login: {get_param: CinderDellPsChapLogin}
cinder::backend::eqlx::eqlx_chap_password: {get_param: CinderDellPsChapPassword}
-
if:
- {equals : [{get_param: CinderDellPsAvailabilityZone}, '']}
- {}
- cinder::backend::eqlx::backend_availability_zone: {get_param: CinderDellPsAvailabilityZone}

+ 0
- 32
environments/cinder-dellps-config.yaml View File

@@ -1,32 +0,0 @@
# Copyright (c) 2016-2017 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.
#
# A Heat environment file which can be used to enable a
# a Cinder Dell EMC PS Series backend, configured via puppet
resource_registry:
OS::TripleO::Services::CinderBackendDellPs: ../deployment/cinder/cinder-backend-dellps-puppet.yaml

parameter_defaults:
CinderEnableDellPsBackend: true
CinderDellPsBackendName: 'tripleo_dellps'
CinderDellPsSanIp: ''
CinderDellPsSanLogin: ''
CinderDellPsSanPassword: ''
CinderDellPsSanPrivateKey: ''
CinderDellPsSanThinProvision: true
CinderDellPsGroupname: 'group-0'
CinderDellPsPool: 'default'
CinderDellPsChapLogin: ''
CinderDellPsChapPassword: ''
CinderDellPsUseChap: false

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

@@ -272,7 +272,6 @@ resource_registry:
OS::TripleO::Services::Zaqar: OS::Heat::None
OS::TripleO::Services::NeutronML2FujitsuCfab: OS::Heat::None
OS::TripleO::Services::NeutronML2FujitsuFossw: OS::Heat::None
OS::TripleO::Services::CinderBackendDellPs: OS::Heat::None
OS::TripleO::Services::CinderBackendDellSc: OS::Heat::None
OS::TripleO::Services::CinderBackendDellEMCUnity: OS::Heat::None
OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI: OS::Heat::None


+ 5
- 0
releasenotes/notes/cinder-remove-dell-ps-fce96d05f529d0da.yaml View File

@@ -0,0 +1,5 @@
---
deprecations:
- |
Support for Dell EMC PS Series aka Eqlx was removed, because the driver was
deprecated in Train release and has been removed from cinder.

+ 0
- 1
roles/Controller.yaml View File

@@ -57,7 +57,6 @@
- OS::TripleO::Services::CephRgw
- OS::TripleO::Services::CertmongerUser
- OS::TripleO::Services::CinderApi
- OS::TripleO::Services::CinderBackendDellPs
- OS::TripleO::Services::CinderBackendDellSc
- OS::TripleO::Services::CinderBackendDellEMCUnity
- OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI


+ 0
- 1
roles/ControllerNoCeph.yaml View File

@@ -49,7 +49,6 @@
- OS::TripleO::Services::CephExternal
- OS::TripleO::Services::CertmongerUser
- OS::TripleO::Services::CinderApi
- OS::TripleO::Services::CinderBackendDellPs
- OS::TripleO::Services::CinderBackendDellSc
- OS::TripleO::Services::CinderBackendDellEMCUnity
- OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI


+ 0
- 1
roles/ControllerNovaStandalone.yaml View File

@@ -42,7 +42,6 @@
- OS::TripleO::Services::CephRgw
- OS::TripleO::Services::CertmongerUser
- OS::TripleO::Services::CinderApi
- OS::TripleO::Services::CinderBackendDellPs
- OS::TripleO::Services::CinderBackendDellSc
- OS::TripleO::Services::CinderBackendDellEMCUnity
- OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI


+ 0
- 1
roles/ControllerStorageDashboard.yaml View File

@@ -58,7 +58,6 @@
- OS::TripleO::Services::CephRgw
- OS::TripleO::Services::CertmongerUser
- OS::TripleO::Services::CinderApi
- OS::TripleO::Services::CinderBackendDellPs
- OS::TripleO::Services::CinderBackendDellSc
- OS::TripleO::Services::CinderBackendDellEMCUnity
- OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI


+ 0
- 1
roles/ControllerStorageNfs.yaml View File

@@ -59,7 +59,6 @@
- OS::TripleO::Services::CephRgw
- OS::TripleO::Services::CertmongerUser
- OS::TripleO::Services::CinderApi
- OS::TripleO::Services::CinderBackendDellPs
- OS::TripleO::Services::CinderBackendDellSc
- OS::TripleO::Services::CinderBackendDellEMCUnity
- OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI


+ 0
- 1
roles/Standalone.yaml View File

@@ -53,7 +53,6 @@
- OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI
- OS::TripleO::Services::CinderBackendDellEMCVNX
- OS::TripleO::Services::CinderBackendDellEMCXTREMIOISCSI
- OS::TripleO::Services::CinderBackendDellPs
- OS::TripleO::Services::CinderBackendDellSc
- OS::TripleO::Services::CinderBackendNVMeOF
- OS::TripleO::Services::CinderBackendPure


+ 0
- 1
roles_data.yaml View File

@@ -60,7 +60,6 @@
- OS::TripleO::Services::CephRgw
- OS::TripleO::Services::CertmongerUser
- OS::TripleO::Services::CinderApi
- OS::TripleO::Services::CinderBackendDellPs
- OS::TripleO::Services::CinderBackendDellSc
- OS::TripleO::Services::CinderBackendDellEMCUnity
- OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI


Loading…
Cancel
Save