Remove deprecated rgw_service
... which was deprecated in 5.0.0 [1].
[1] f5c1cf3ad5
Related-Bug: #2029009
Change-Id: I1d75dce1f4a74c19210f9e5de673d76bdfecd1e5
This commit is contained in:
parent
4f59b7e977
commit
2bbb88eeee
@ -49,12 +49,6 @@
|
|||||||
# (Optional) Type of service.
|
# (Optional) Type of service.
|
||||||
# Defaults to 'object-store'.
|
# Defaults to 'object-store'.
|
||||||
#
|
#
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
#
|
|
||||||
# [*rgw_service*]
|
|
||||||
# Name of the keystone service used by RGW
|
|
||||||
# Defaults to undef
|
|
||||||
#
|
|
||||||
class ceph::rgw::keystone::auth (
|
class ceph::rgw::keystone::auth (
|
||||||
$password,
|
$password,
|
||||||
$user,
|
$user,
|
||||||
@ -68,25 +62,16 @@ class ceph::rgw::keystone::auth (
|
|||||||
$service_description = 'Ceph RGW Service',
|
$service_description = 'Ceph RGW Service',
|
||||||
$service_name = 'swift',
|
$service_name = 'swift',
|
||||||
$service_type = 'object-store',
|
$service_type = 'object-store',
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
$rgw_service = undef,
|
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include openstacklib::openstackclient
|
include openstacklib::openstackclient
|
||||||
|
|
||||||
if $rgw_service {
|
ensure_resource('keystone_service', "${service_name}::${service_type}", {
|
||||||
warning('The rgw_service parameter is deprecated')
|
|
||||||
$rgw_service_real = $rgw_service
|
|
||||||
} else {
|
|
||||||
$rgw_service_real = "${service_name}::${service_type}"
|
|
||||||
}
|
|
||||||
|
|
||||||
ensure_resource('keystone_service', $rgw_service_real, {
|
|
||||||
'ensure' => 'present',
|
'ensure' => 'present',
|
||||||
'description' => $service_description,
|
'description' => $service_description,
|
||||||
} )
|
} )
|
||||||
|
|
||||||
ensure_resource('keystone_endpoint', "${region}/${rgw_service_real}", {
|
ensure_resource('keystone_endpoint', "${region}/${service_name}::${service_type}", {
|
||||||
'ensure' => 'present',
|
'ensure' => 'present',
|
||||||
'public_url' => $public_url,
|
'public_url' => $public_url,
|
||||||
'admin_url' => $admin_url,
|
'admin_url' => $admin_url,
|
||||||
|
@ -0,0 +1,4 @@
|
|||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
The ``ceph::rgw::keystone::auth::rgw_service`` parameter has been removed.
|
Loading…
Reference in New Issue
Block a user