Remove deprecated cinder parameters
Clean up parameters and hiera data associated with deprecated cinder parameters removed from puppet-cinder [1] and puppet-tripleo [2]. [1] https://review.opendev.org/678965 [2] https://review.opendev.org/679246 Change-Id: I931b0373cb30c05cdb220e6fbe1a1673bec835a5
This commit is contained in:
parent
e709025a03
commit
b5b6e476d6
|
@ -189,9 +189,6 @@ outputs:
|
||||||
- {get_param: CinderApiLoggingSource}
|
- {get_param: CinderApiLoggingSource}
|
||||||
keystone:
|
keystone:
|
||||||
cinder::keystone::auth::tenant: 'service'
|
cinder::keystone::auth::tenant: 'service'
|
||||||
cinder::keystone::auth::public_url: {get_param: [EndpointMap, CinderPublic, uri]}
|
|
||||||
cinder::keystone::auth::internal_url: {get_param: [EndpointMap, CinderInternal, uri]}
|
|
||||||
cinder::keystone::auth::admin_url: {get_param: [EndpointMap, CinderAdmin, uri]}
|
|
||||||
cinder::keystone::auth::public_url_v2: {get_param: [EndpointMap, CinderV2Public, uri]}
|
cinder::keystone::auth::public_url_v2: {get_param: [EndpointMap, CinderV2Public, uri]}
|
||||||
cinder::keystone::auth::internal_url_v2: {get_param: [EndpointMap, CinderV2Internal, uri]}
|
cinder::keystone::auth::internal_url_v2: {get_param: [EndpointMap, CinderV2Internal, uri]}
|
||||||
cinder::keystone::auth::admin_url_v2: {get_param: [EndpointMap, CinderV2Admin, uri]}
|
cinder::keystone::auth::admin_url_v2: {get_param: [EndpointMap, CinderV2Admin, uri]}
|
||||||
|
|
|
@ -102,11 +102,6 @@ parameters:
|
||||||
type: json
|
type: json
|
||||||
description: Mapping of service endpoint -> protocol. Typically set
|
description: Mapping of service endpoint -> protocol. Typically set
|
||||||
via parameter_defaults in the resource registry.
|
via parameter_defaults in the resource registry.
|
||||||
parameter_groups:
|
|
||||||
- label: deprecated
|
|
||||||
description: Do not use deprecated params, they will be removed.
|
|
||||||
parameters:
|
|
||||||
- CinderDellScExcludedDomainIp
|
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
role_data:
|
role_data:
|
||||||
|
@ -131,7 +126,6 @@ outputs:
|
||||||
cinder::backend::dellsc_iscsi::secondary_san_password: {get_param: CinderDellScSecondarySanPassword}
|
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::secondary_sc_api_port: {get_param: CinderDellScSecondaryScApiPort}
|
||||||
cinder::backend::dellsc_iscsi::excluded_domain_ips: {get_param: CinderDellScExcludedDomainIps}
|
cinder::backend::dellsc_iscsi::excluded_domain_ips: {get_param: CinderDellScExcludedDomainIps}
|
||||||
cinder::backend::dellsc_iscsi::excluded_domain_ip: {get_param: CinderDellScExcludedDomainIp}
|
|
||||||
cinder::backend::dellsc_iscsi::use_multipath_for_image_xfer: {get_param: CinderDellScMultipathXfer}
|
cinder::backend::dellsc_iscsi::use_multipath_for_image_xfer: {get_param: CinderDellScMultipathXfer}
|
||||||
-
|
-
|
||||||
if:
|
if:
|
||||||
|
|
|
@ -118,12 +118,6 @@ parameters:
|
||||||
type: string
|
type: string
|
||||||
default: ''
|
default: ''
|
||||||
|
|
||||||
parameter_groups:
|
|
||||||
- label: deprecated
|
|
||||||
description: Do not use deprecated params, they will be removed.
|
|
||||||
parameters:
|
|
||||||
- CinderNetappStoragePools
|
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
role_data:
|
role_data:
|
||||||
description: Role data for the Cinder NetApp backend.
|
description: Role data for the Cinder NetApp backend.
|
||||||
|
@ -155,15 +149,9 @@ outputs:
|
||||||
cinder::backend::netapp::netapp_webservice_path: {get_param: CinderNetappWebservicePath}
|
cinder::backend::netapp::netapp_webservice_path: {get_param: CinderNetappWebservicePath}
|
||||||
cinder::backend::netapp::nas_secure_file_operations: {get_param: CinderNetappNasSecureFileOperations}
|
cinder::backend::netapp::nas_secure_file_operations: {get_param: CinderNetappNasSecureFileOperations}
|
||||||
cinder::backend::netapp::nas_secure_file_permissions: {get_param: CinderNetappNasSecureFilePermissions}
|
cinder::backend::netapp::nas_secure_file_permissions: {get_param: CinderNetappNasSecureFilePermissions}
|
||||||
|
cinder::backend::netapp::netapp_pool_name_search_pattern: {get_param: CinderNetappPoolNameSearchPattern}
|
||||||
-
|
-
|
||||||
if:
|
if:
|
||||||
- {equals : [{get_param: CinderNetappAvailabilityZone}, '']}
|
- {equals : [{get_param: CinderNetappAvailabilityZone}, '']}
|
||||||
- {}
|
- {}
|
||||||
- cinder::backend::netapp::backend_availability_zone: {get_param: CinderNetappAvailabilityZone}
|
- cinder::backend::netapp::backend_availability_zone: {get_param: CinderNetappAvailabilityZone}
|
||||||
-
|
|
||||||
# Prefer CinderNetappPoolNameSearchPattern unless the (deprecated)
|
|
||||||
# CinderNetappStoragePools has a non-empty value.
|
|
||||||
if:
|
|
||||||
- {equals : [{get_param: CinderNetappStoragePools}, '']}
|
|
||||||
- cinder::backend::netapp::netapp_pool_name_search_pattern: {get_param: CinderNetappPoolNameSearchPattern}
|
|
||||||
- cinder::backend::netapp::netapp_storage_pools: {get_param: CinderNetappStoragePools}
|
|
||||||
|
|
Loading…
Reference in New Issue