openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Remove deprecated storage template and parameters 

This change removes all the deprecated templates and parameters
for storage services like Cinder, Manila and Swift.

Deprecated templates removed :
  Cinder:
    cinder-backend-dellsc-puppet.yaml

Deprecated parameters removed :
  Cinder:
    CinderNetappStoragePools
    CinderNetappVolumeList
  Manila:
    ManilaCephFSCephFSEnableSnapshots
    ManilaIsilonDriverHandlesShareServers
    ManilaVMAXDriverHandlesShareServers
    ManilaVNXDriverHandlesShareServers
  Swift:
    ControllerEnableSwiftStorage

Change-Id: If04f7c9f25928eb17d42cd73e310069814ea45a3
This commit is contained in:
katarimanoj 2022-04-26 16:03:46 +05:30 committed by Manojkatari
parent 9d95441f0f
commit 3699a56891
12 changed files with 13 additions and 252 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

154
deployment/cinder/cinder-backend-dellsc-puppet.yaml
View File

@ -1,154 +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.
heat_template_version: wallaby
description: >
Openstack Cinder Dell EMC Storage Center backend
Please note, this template is deprecated now.
Use Cinder Dell EMC SC backend template defined in
cinder-backend-dellemc-sc-puppet.yaml.
parameters:
CinderEnableDellScBackend:
type: boolean
default: true
CinderDellScBackendName:
type: string
default: 'tripleo_dellsc'
CinderDellScAvailabilityZone:
default: ''
description: >
The availability zone of the Dell SC Cinder backend.
When set, it overrides the default CinderStorageAvailabilityZone.
type: string
CinderDellScSanIp:
type: string
CinderDellScSanLogin:
type: string
default: 'Admin'
CinderDellScSanPassword:
type: string
hidden: true
CinderDellScSsn:
type: number
default: 64702
CinderDellScIscsiIpAddress:
type: string
default: ''
CinderDellScIscsiPort:
type: number
default: 3260
CinderDellScApiPort:
type: number
default: 3033
CinderDellScServerFolder:
type: string
default: 'dellsc_server'
CinderDellScVolumeFolder:
type: string
default: 'dellsc_volume'
CinderDellScSecondarySanIp:
type: string
default: ''
CinderDellScSecondarySanLogin:
type: string
default: 'Admin'
CinderDellScSecondarySanPassword:
type: string
hidden: true
CinderDellScSecondaryScApiPort:
type: number
default: 3033
CinderDellScExcludedDomainIp:
type: string
default: ''
CinderDellScExcludedDomainIps:
type: comma_delimited_list
default: []
CinderDellScMultipathXfer:
type: boolean
default: true
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.
parameter_groups:
- label: deprecated
description: |
The following parameters are deprecated and will be removed.
parameters:
- CinderEnableDellScBackend
- CinderDellScBackendName
- CinderDellScSanIp
- CinderDellScSanLogin
- CinderDellScSanPassword
- CinderDellScSsn
- CinderDellScIscsiIpAddress
- CinderDellScIscsiPort
- CinderDellScApiPort
- CinderDellScServerFolder
- CinderDellScVolumeFolder
- CinderDellScSecondarySanIp
- CinderDellScSecondarySanLogin
- CinderDellScSecondarySanPassword
- CinderDellScSecondaryScApiPort
- CinderDellScExcludedDomainIps
- CinderDellScMultipathXfer
outputs:
role_data:
description: Role data for the Cinder Dell EMC Storage Center backend.
value:
service_name: cinder_backend_dellsc
config_settings:
map_merge:
- tripleo::profile::base::cinder::volume::cinder_enable_dellsc_backend: {get_param: CinderEnableDellScBackend}
cinder::backend::dellsc_iscsi::volume_backend_name: {get_param: CinderDellScBackendName}
cinder::backend::dellsc_iscsi::san_ip: {get_param: CinderDellScSanIp}
cinder::backend::dellsc_iscsi::san_login: {get_param: CinderDellScSanLogin}
cinder::backend::dellsc_iscsi::san_password: {get_param: CinderDellScSanPassword}
cinder::backend::dellsc_iscsi::dell_sc_ssn: {get_param: CinderDellScSsn}
cinder::backend::dellsc_iscsi::iscsi_ip_address: {get_param: CinderDellScIscsiIpAddress}
cinder::backend::dellsc_iscsi::iscsi_port: {get_param: CinderDellScIscsiPort}
cinder::backend::dellsc_iscsi::dell_sc_api_port: {get_param: CinderDellScApiPort}
cinder::backend::dellsc_iscsi::dell_sc_server_folder: {get_param: CinderDellScServerFolder}
cinder::backend::dellsc_iscsi::dell_sc_volume_folder: {get_param: CinderDellScVolumeFolder}
cinder::backend::dellsc_iscsi::secondary_san_ip: {get_param: CinderDellScSecondarySanIp}
cinder::backend::dellsc_iscsi::secondary_san_login: {get_param: CinderDellScSecondarySanLogin}
cinder::backend::dellsc_iscsi::secondary_san_password: {get_param: CinderDellScSecondarySanPassword}
cinder::backend::dellsc_iscsi::secondary_sc_api_port: {get_param: CinderDellScSecondaryScApiPort}
cinder::backend::dellsc_iscsi::excluded_domain_ips: {get_param: CinderDellScExcludedDomainIps}
cinder::backend::dellsc_iscsi::use_multipath_for_image_xfer: {get_param: CinderDellScMultipathXfer}
- if:
- not: {equals : [{get_param: CinderDellScAvailabilityZone}, '']}
- cinder::backend::dellsc_iscsi::backend_availability_zone: {get_param: CinderDellScAvailabilityZone}

17
deployment/cinder/cinder-backend-netapp-puppet.yaml
View File

@ -115,23 +115,6 @@ parameters:
CinderNetappNasSecureFilePermissions:
type: string
default: 'false'
# DEPRECATED options for compatibility with older versions
# These are obsolete now that CinderNetappPoolNameSearchPattern is fully
# supported here and in puppet-tripleo.
CinderNetappStoragePools:
type: string
default: ''
CinderNetappVolumeList:
type: string
default: ''
parameter_groups:
- label: deprecated
description: |
The following parameters are deprecated and will be removed.
parameters:
- CinderNetappStoragePools
- CinderNetappVolumeList
outputs:
role_data:

17
deployment/manila/manila-backend-cephfs.yaml
View File

@ -73,23 +73,6 @@ parameters:
type: string
constraints:
- allowed_values: ['CEPHFS', 'NFS']
# Deprecated parameters
ManilaCephFSCephFSEnableSnapshots:
type: boolean
description: |
Enable snapshot support in CephFS driver. Note that this parameter has
no effect now and snapshot support is always enabled.
default: false
parameter_groups:
- label: deprecated
description: |
The following parameters are deprecated and will be removed. They should not
be relied on for new deployments. If you have concerns regarding deprecated
parameters, please contact the TripleO development team on IRC or the
OpenStack mailing list.
parameters:
- ManilaCephFSCephFSEnableSnapshots
outputs:
role_data:

13
deployment/manila/manila-backend-isilon.yaml
View File

@ -4,9 +4,6 @@ description: >
Openstack Manila isilon backend.
parameters:
ManilaIsilonDriverHandlesShareServers:
type: string
default: true
ManilaIsilonBackendName:
type: string
default: tripleo_isilon
@ -59,16 +56,6 @@ parameters:
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
parameter_groups:
- label: deprecated
description: |
The following parameters are deprecated and will be removed. They should not
be relied on for new deployments. If you have concerns regarding deprecated
parameters, please contact the TripleO development team on IRC or the
OpenStack mailing list.
parameters:
- ManilaIsilonDriverHandlesShareServers
outputs:
role_data:
description: Role data for the Manila Isilon backend.

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

@ -4,9 +4,6 @@ description: >
Openstack Manila vmax backend.
parameters:
ManilaVMAXDriverHandlesShareServers:
type: string
default: false
ManilaVMAXBackendName:
type: string
default: tripleo_manila_vmax
@ -59,16 +56,6 @@ parameters:
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
parameter_groups:
- label: deprecated
description: |
The following parameters are deprecated and will be removed. They should not
be relied on for new deployments. If you have concerns regarding deprecated
parameters, please contact the TripleO development team on IRC or the
OpenStack mailing list.
parameters:
- ManilaVMAXDriverHandlesShareServers
outputs:
role_data:
description: Role data for the Manila VMAX backend.

13
deployment/manila/manila-backend-vnx.yaml
View File

@ -4,9 +4,6 @@ description: >
Openstack Manila VNX backend.
parameters:
ManilaVNXDriverHandlesShareServers:
type: string
default: false
ManilaVNXBackendName:
type: string
default: tripleo_manila_vnx
@ -69,16 +66,6 @@ parameters:
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
parameter_groups:
- label: deprecated
description: |
The following parameters are deprecated and will be removed. They should not
be relied on for new deployments. If you have concerns regarding deprecated
parameters, please contact the TripleO development team on IRC or the
OpenStack mailing list.
parameters:
- ManilaVNXDriverHandlesShareServers
outputs:
role_data:
description: Role data for the Manila VNX backend.

14
deployment/swift/swift-storage-container-puppet.yaml
View File

@ -128,20 +128,6 @@ parameters:
without TLS.
type: boolean
# DEPRECATED options for compatibility with overcloud.yaml
# This should be removed and manipulation of the ControllerServices list
# used instead, but we need client support for that first
ControllerEnableSwiftStorage:
default: true
description: Whether to enable Swift Storage on the Controller
type: boolean
parameter_groups:
- label: deprecated
description: Do not use deprecated params, they will be removed.
parameters:
- ControllerEnableSwiftStorage
conditions:
single_replica_mode: {equals: [{get_param: SwiftReplicas}, 1]}
swift_mount_check:

1
environments/manila-isilon-config.yaml
View File

@ -8,7 +8,6 @@ resource_registry:
parameter_defaults:
ManilaIsilonBackendName: tripleo_isilon
ManilaIsilonDriverHandlesShareServers: true
ManilaIsilonNasLogin: ''
ManilaIsilonNasPassword: ''
ManilaIsilonNasServer: ''

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

@ -8,7 +8,6 @@ resource_registry:
parameter_defaults:
ManilaVMAXBackendName: tripleo_manila_vmax
ManilaVMAXDriverHandlesShareServers: true
ManilaVMAXNasLogin: ''
ManilaVMAXNasPassword: ''
ManilaVMAXNasServer: ''

1
environments/manila-vnx-config.yaml
View File

@ -8,7 +8,6 @@ resource_registry:
parameter_defaults:
ManilaVNXBackendName: tripleo_manila_vnx
ManilaVNXDriverHandlesShareServers: true
ManilaVNXNasLogin: ''
ManilaVNXNasPassword: ''
ManilaVNXNasServer: ''

8
environments/storage/cinder-netapp-config.yaml
View File

@ -92,10 +92,6 @@ parameter_defaults:
# Type: string
CinderNetappStorageFamily: ontap_cluster
#
# Type: string
CinderNetappStoragePools: ''
#
# Type: string
CinderNetappStorageProtocol: nfs
@ -108,10 +104,6 @@ parameter_defaults:
# Type: string
CinderNetappVfiler: ''
#
# Type: string
CinderNetappVolumeList: ''
#
# Type: string
CinderNetappVserver: ''

13
releasenotes/notes/remove_deprecated-storage-templates-and-params-a2707785af9f617b.yaml Normal file
View File

@ -0,0 +1,13 @@
---
upgrade:
- |
The deprecated template file ``cinder-backend-dellsc-puppet.yaml`` is
removed as ``cinder-backend-dellemc-sc-puppet.yaml`` enables both iSCSI
and FC support for Dell EMC SC.
- |
The following deprecated parameters are removed.
- ``CinderNetappStoragePools``
- ``CinderNetappVolumeList``
- ``ControllerEnableSwiftStorage``