openstack/puppet-keystone
Code Issues Proposed changes

Remove deprecated bind, port and workers parameters

Browse Source 
Change-Id: I4291174f58b8cc74a687fa63734d249bcdba31aa
This commit is contained in:
Tobias Urdin
2020-08-18 09:35:02 +02:00
parent b8b8dfeb78
commit 960c621923
6 changed files with 21 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
examples/apache_with_paths.pp
View File

@@ -4,16 +4,16 @@
# $ export OS_USERNAME=admin
# $ export OS_PASSWORD=ChangeMe
# $ export OS_TENANT_NAME=openstack
# $ export OS_AUTH_URL=http://keystone.local/keystone/main/v3
# $ export OS_AUTH_URL=http://keystone.local/v3
# $ keystone catalog
# Service: identity
# +-------------+----------------------------------------------+
# | Property | Value |
# +-------------+----------------------------------------------+
# | adminURL | http://keystone.local:80/keystone/admin/v3 |
# | adminURL | http://keystone.local:80/v3 |
# | id | 4f0f55f6789d4c73a53c51f991559b72 |
# | internalURL | http://keystone.local:80/keystone/main/v3 |
# | publicURL | http://keystone.local:80/keystone/main/v3 |
# | internalURL | http://keystone.local:80/v3 |
# | publicURL | http://keystone.local:80/v3 |
# | region | RegionOne |
# +-------------+----------------------------------------------+
#
@@ -32,17 +32,14 @@ class { 'keystone':
}
class { 'keystone::bootstrap':
password => 'ChangeMe',
public_url => "https://${::fqdn}:443/main",
admin_url => "https://${::fqdn}:443/admin",
public_url => "https://${::fqdn}:443/v3",
admin_url => "https://${::fqdn}:443/v3",
}
keystone_config { 'ssl/enable': ensure => absent }
include apache
class { 'keystone::wsgi::apache':
ssl => true,
public_port => 443,
admin_port => 443,
public_path => '/main/',
admin_path => '/admin/'
ssl => true,
api_port => 443,
}

25
manifests/federation/mellon.pp
View File

@@ -36,38 +36,19 @@
# (optional) Wheater or not to enable Web Single Sign-On (SSO)
# Defaults to false
#
# === DEPRECATED
#
# [*admin_port*]
# A boolean value to ensure that you want to configure K2K Federation
# using Keystone VirtualHost on port 35357.
# (Optional) Defaults to undef.
#
# [*main_port*]
# A boolean value to ensure that you want to configure K2K Federation
# using Keystone VirtualHost on port 5000.
# (Optional) Defaults to undef.
#
class keystone::federation::mellon (
$methods,
$idp_name,
$protocol_name,
$template_order = 331,
$package_ensure = present,
$enable_websso = false,
# DEPRECATED
$admin_port = undef,
$main_port = undef,
$template_order = 331,
$package_ensure = present,
$enable_websso = false,
) {
include apache
include keystone::deps
include keystone::params
if $admin_port or $main_port {
warning('keystone::federation::mellon::admin_port and main_port are deprecated and have no effect')
}
# Note: if puppet-apache modify these values, this needs to be updated
if $template_order <= 330 or $template_order >= 999 {
fail('The template order should be greater than 330 and less than 999.')

21
manifests/federation/shibboleth.pp
View File

@@ -37,41 +37,22 @@
# require => Anchor['openstack_extras_redhat']
# }
#
# === DEPRECATED
#
# [*admin_port*]
# A boolean value to ensure that you want to configure K2K Federation
# using Keystone VirtualHost on port 35357.
# (Optional) Defaults to undef
#
# [*main_port*]
# A boolean value to ensure that you want to configure K2K Federation
# using Keystone VirtualHost on port 5000.
# (Optional) Defaults to undef
#
# == Note about Redhat osfamily
# According to puppet-apache we need to enable a new repo, but in puppet-openstack
# we won't enable any external third party repo.
# http://wiki.aaf.edu.au/tech-info/sp-install-guide. We provide some helpers but
# as the packaging is lacking official support, we cannot guaranty it will work.
#
class keystone::federation::shibboleth(
class keystone::federation::shibboleth (
$methods,
$suppress_warning = false,
$template_order = 331,
$yum_repo_name = 'shibboleth',
# DEPRECATED
$admin_port = undef,
$main_port = undef,
) {
include apache
include keystone::deps
if $admin_port or $main_port {
warning('keystone::federation::shibboleth::admin_port and main_port are deprecated and have no effect')
}
# Note: if puppet-apache modify these values, this needs to be updated
if $template_order <= 330 or $template_order >= 999 {
fail('The template order should be greater than 330 and less than 999.')

63
manifests/init.pp
View File

@@ -399,36 +399,6 @@
# (Optional) Whether to use durable queues in AMQP.
# Defaults to $::os_service_default.
#
# === DEPRECATED PARAMETERS
#
# [*admin_bind_host*]
# (Optional) The IP address of the public network interface to listen on.
# Default to undef
#
# [*public_bind_host*]
# (Optional) The IP address of the public network interface to listen on.
# Default to '0.0.0.0'
#
# [*admin_port*]
# (Optional) Port that can be used for admin tasks.
# Defaults to undef
#
# [*public_port*]
# (Optional) Port that keystone binds to.
# Defaults to '5000'
#
# [*admin_workers*]
# (Optional) The number of worker processes to serve the admin eventlet application.
# This option is deprecated along with eventlet and will be removed in M.
# This setting has no affect when using WSGI.
# Defaults to undef
#
# [*public_workers*]
# (Optional) The number of worker processes to serve the public eventlet application.
# This option is deprecated along with eventlet and will be removed in M.
# This setting has no affect when using WSGI.
# Defaults to undef
#
# == Authors
#
# Dan Bode dan@puppetlabs.com
@@ -510,49 +480,16 @@ class keystone(
$max_request_body_size = $::os_service_default,
$purge_config = false,
$amqp_durable_queues = $::os_service_default,
# DEPRECATED PARAMETERS
$admin_bind_host = undef,
$public_bind_host = undef,
$admin_port = undef,
$public_port = undef,
$admin_workers = undef,
$public_workers = undef,
) inherits keystone::params {
include keystone::deps
include keystone::logging
include keystone::policy
if $admin_bind_host {
warning('keystone::admin_bond_host is deprecated, has not effect and will be removed in a later relase')
}
if $admin_port {
warning('keystone::admin_port is deprecated, has not effect and will be removed in a later relase')
}
if $admin_workers {
warning('keystone::admin_workers is deprecated, has no effect and will be removed in a later release')
}
if $public_workers {
warning('keystone::public_workers is deprecated, has no effect and will be removed in a later release')
}
if ! $catalog_driver {
validate_legacy(Enum['template', 'sql'], 'validate_re', $catalog_type)
}
if $public_bind_host {
warning('keystone::public_bind_host is deprecated. This parameter has no effect and \
will be removed in a later release.')
}
if $public_port {
warning('keystone::public_port is deprecated. This parameter has no effect and \
will be removed in a later release')
}
if $manage_policyrcd {
# openstacklib policy_rcd only affects debian based systems.
Policy_rcd <| title == 'keystone' |> -> Package['keystone']

9
releasenotes/notes/remove-deprecated-bind-and-port-params-35ed404c0a0597f8.yaml Normal file
View File

@@ -0,0 +1,9 @@
---
upgrade:
- |
The deprecated parameters admin_bind_host, public_bind_host, admin_port,
public_port, admin_workers and public_workers in the keystone init class
is removed.
- |
The deprecated parameters admin_port and main_port in the classes
keystone::federation::mellon and keystone::federation::shibboleth is removed.

4
spec/classes/keystone_init_spec.rb
View File

@@ -21,8 +21,6 @@ describe 'keystone' do
default_params = {
'package_ensure' => 'present',
'client_package_ensure' => 'present',
'public_bind_host' => '0.0.0.0',
'public_port' => '5000',
'catalog_type' => 'sql',
'catalog_driver' => false,
'token_provider' => 'fernet',
@@ -55,8 +53,6 @@ describe 'keystone' do
override_params = {
'package_ensure' => 'latest',
'client_package_ensure' => 'latest',
'public_bind_host' => '0.0.0.0',
'public_port' => '5001',
'catalog_type' => 'template',
'token_provider' => 'uuid',
'password_hash_algorithm' => 'pbkdf2_sha512',