openstack/puppet-ironic
Code Issues Proposed changes

inspector: Remove deprecated ironic/swift parameters

Browse Source 
These parameters were deprecated during Ussuri cycle by [1] in favor of
the independent classes to manage ironic/swift parameters.

[1] 762804b38e
Change-Id: I48a138934a896b20e714a3c73a24199d023b4236
This commit is contained in:
Takashi Kajinami
2022-01-25 19:21:49 +09:00
parent f017521d93
commit d1f63388d4
5 changed files with 49 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
manifests/inspector.pp
View File

@@ -192,81 +192,6 @@
#
# DEPRECATED PARAMETERS
#
# [*swift_auth_type*]
# (optional) Authentication plugin for accessing Swift
# Defaults to undef.
#
# [*swift_username*]
# (optional) User name for accessing Swift API
# Defaults to undef.
#
# [*swift_password*]
# (optional) Password for accessing Swift API
# Defaults to undef.
#
# [*swift_tenant_name*]
# (optional) Tenant name for accessing Swift API
# Defaults to undef.
#
# [*swift_project_domain_name*]
# (Optional) Name of domain for $swift_tenant_name
# Defaults to undef.
#
# [*swift_user_domain_name*]
# (Optional) Name of domain for $swift_username
# Defaults to undef.
#
# [*swift_auth_url*]
# (optional) Keystone authentication URL for Swift
# Defautls to undef.
#
# [*swift_container*]
# (optional) Default Swift container name to use when creating objects.
# String value
# Defaults to undef.
#
# [*ironic_auth_type*]
# (optional) Authentication plugin for accessing Ironic
# Defaults to undef
#
# [*ironic_username*]
# (optional) User name for accessing Ironic API
# Defaults to undef
#
# [*ironic_password*]
# (optional) Password for accessing Ironic API
# Defaults to undef.
#
# [*ironic_tenant_name*]
# (optional) Tenant name for accessing Ironic API
# Defaults to undef.
#
# [*ironic_project_domain_name*]
# (Optional) Name of domain for $ironic_tenant_name
# Defaults to undef.
#
# [*ironic_user_domain_name*]
# (Optional) Name of domain for $ironic_username
# Defaults to undef.
#
# [*ironic_auth_url*]
# (optional) Keystone authentication URL for Ironic
# Defautls to undef.
#
# [*ironic_url*]
# (optional) Ironic API URL, used to set Ironic API URL when auth_strategy
# option is noauth or auth_type is "none" to work with standalone Ironic
# without keystone. String value
# Defaults to 'undef'
#
# [*ironic_max_retries*]
# (optional) Maximum number of retries in case of conflict error
# Defaults to undef.
#
# [*ironic_retry_interval*]
# (optional) Interval between retries in case of conflict error
# Defaults to undef.
#
# [*db_connection*]
# (optional) Location of the ironic-inspector node cache database
# Defaults to undef
@@ -308,24 +233,6 @@ class ironic::inspector (
$port_physnet_cidr_map = {},
$uefi_ipxe_bootfile_name = 'snponly.efi',
# DEPRECATED PARAMETERS
$swift_auth_type = undef,
$swift_username = undef,
$swift_password = undef,
$swift_tenant_name = undef,
$swift_project_domain_name = undef,
$swift_user_domain_name = undef,
$swift_auth_url = undef,
$swift_container = undef,
$ironic_auth_type = undef,
$ironic_username = undef,
$ironic_password = undef,
$ironic_tenant_name = undef,
$ironic_project_domain_name = undef,
$ironic_user_domain_name = undef,
$ironic_auth_url = undef,
$ironic_url = undef,
$ironic_max_retries = undef,
$ironic_retry_interval = undef,
$db_connection = undef,
) {
@@ -337,19 +244,12 @@ class ironic::inspector (
include ironic::pxe::common
include ironic::inspector::db
include ironic::inspector::policy
include ironic::inspector::swift
include ironic::inspector::ironic
if $db_connection != undef {
warning('The db_connection parameter is deprecated and will be removed \
in a future realse. Use ironic::inspector::db::database_connection instead')
}
if $ironic_url != undef {
warning('ironic::inspector::ironic_url is now deprecated and has no effect. \
Use ironic::inspector::ironic::endpoint_override instead.')
}
if $auth_strategy == 'keystone' {
include ironic::inspector::authtoken
}

33
manifests/inspector/ironic.pp
View File

@@ -1,4 +1,4 @@
# Licensed under the Apache License, Version 2.0 (the "License")_real; you may
# 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
#
@@ -71,28 +71,17 @@ class ironic::inspector::ironic (
$retry_interval = $::os_service_default,
) {
$auth_type_real = pick($::ironic::inspector::ironic_auth_type, $auth_type)
$auth_url_real = pick($::ironic::inspector::ironic_auth_url, $auth_url)
$username_real = pick($::ironic::inspector::ironic_username, $username)
$password_real = pick($::ironic::inspector::ironic_password, $password)
$project_name_real = pick($::ironic::inspector::ironic_tenant_name, $project_name)
$user_domain_name_real = pick($::ironic::inspector::ironic_user_domain_name, $user_domain_name)
$project_domain_name_real = pick($::ironic::inspector::ironic_project_domain_name, $project_domain_name)
$region_name_real = pick($::ironic::inspector::ironic_region_name, $region_name)
$max_retries_real = pick($::ironic::inspector::ironic_max_retries, $max_retries)
$retry_interval_real = pick($::ironic::inspector::ironic_retry_interval, $retry_interval)
ironic_inspector_config {
'ironic/auth_type': value => $auth_type_real;
'ironic/username': value => $username_real;
'ironic/password': value => $password_real, secret => true;
'ironic/auth_url': value => $auth_url_real;
'ironic/project_name': value => $project_name_real;
'ironic/user_domain_name': value => $user_domain_name_real;
'ironic/project_domain_name': value => $project_domain_name_real;
'ironic/region_name': value => $region_name_real;
'ironic/auth_type': value => $auth_type;
'ironic/username': value => $username;
'ironic/password': value => $password, secret => true;
'ironic/auth_url': value => $auth_url;
'ironic/project_name': value => $project_name;
'ironic/user_domain_name': value => $user_domain_name;
'ironic/project_domain_name': value => $project_domain_name;
'ironic/region_name': value => $region_name;
'ironic/endpoint_override': value => $endpoint_override;
'ironic/max_retries': value => $max_retries_real;
'ironic/retry_interval': value => $retry_interval_real;
'ironic/max_retries': value => $max_retries;
'ironic/retry_interval': value => $retry_interval;
}
}

28
manifests/inspector/swift.pp
View File

@@ -73,27 +73,17 @@ class ironic::inspector::swift (
$delete_after = $::os_service_default,
) {
$auth_type_real = pick($::ironic::inspector::swift_auth_type, $auth_type)
$auth_url_real = pick($::ironic::inspector::swift_auth_url, $auth_url)
$username_real = pick($::ironic::inspector::swift_username, $username)
$password_real = pick($::ironic::inspector::swift_password, $password)
$project_name_real = pick($::ironic::inspector::swift_tenant_name, $project_name)
$user_domain_name_real = pick($::ironic::inspector::swift_user_domain_name, $user_domain_name)
$project_domain_name_real = pick($::ironic::inspector::swift_project_domain_name, $project_domain_name)
$region_name_real = pick($::ironic::inspector::swift_region_name, $region_name)
$container_real = pick($::ironic::inspector::swift_container, $container)
ironic_inspector_config {
'swift/auth_type': value => $auth_type_real;
'swift/username': value => $username_real;
'swift/password': value => $password_real, secret => true;
'swift/auth_url': value => $auth_url_real;
'swift/project_name': value => $project_name_real;
'swift/user_domain_name': value => $user_domain_name_real;
'swift/project_domain_name': value => $project_domain_name_real;
'swift/region_name': value => $region_name_real;
'swift/auth_type': value => $auth_type;
'swift/username': value => $username;
'swift/password': value => $password, secret => true;
'swift/auth_url': value => $auth_url;
'swift/project_name': value => $project_name;
'swift/user_domain_name': value => $user_domain_name;
'swift/project_domain_name': value => $project_domain_name;
'swift/region_name': value => $region_name;
'swift/endpoint_override': value => $endpoint_override;
'swift/container': value => $container_real;
'swift/container': value => $container;
'swift/delete_after': value => $delete_after;
}
}

29
releasenotes/notes/cleanup-inspector-opts-d1a74ddabe494bcd.yaml Normal file
View File

@@ -0,0 +1,29 @@
---
upgrade:
- |
The following parameters of the ``ironic::inspector`` class have been
removed. Use the ``ironic::inspector::swift`` class instead.
- ``swift_auth_type``
- ``swift_username``
- ``swift_password``
- ``swift_tenant_name``
- ``swift_project_domain_name``
- ``swift_user_domain_name``
- ``swift_auth_url``
- ``swift_container``
- |
The following parameters of the ``ironic::inspector`` class have been
removed. Use the ``ironic::inspector::ironic`` class instead.
- ``ironic_auth_type``
- ``ironic_username``
- ``ironic_password``
- ``ironic_tenant_name``
- ``ironic_project_domain_name``
- ``ironic_user_domain_name``
- ``ironic_auth_url``
- ``ironic_url``
- ``ironic_max_retries``
- ``ironic_retry_interval``

40
spec/classes/ironic_inspector_spec.rb
View File

@@ -35,16 +35,6 @@ describe 'ironic::inspector' do
:add_ports => 'pxe',
:keep_ports => 'all',
:store_data => 'none',
:ironic_auth_type => 'password',
:ironic_username => 'ironic',
:ironic_tenant_name => 'services',
:ironic_auth_url => 'http://127.0.0.1:5000/v3',
:ironic_max_retries => 30,
:ironic_retry_interval => 2,
:swift_auth_type => 'password',
:swift_username => 'ironic',
:swift_tenant_name => 'services',
:swift_auth_url => 'http://127.0.0.1:5000/v3',
:dnsmasq_ip_subnets => [{ 'ip_range' =>
'192.168.0.100,192.168.0.120',
'mtu' => '1350'},
@@ -131,20 +121,6 @@ describe 'ironic::inspector' do
is_expected.to contain_ironic_inspector_config('processing/add_ports').with_value(p[:add_ports])
is_expected.to contain_ironic_inspector_config('processing/keep_ports').with_value(p[:keep_ports])
is_expected.to contain_ironic_inspector_config('processing/store_data').with_value(p[:store_data])
is_expected.to contain_ironic_inspector_config('ironic/auth_type').with_value(p[:ironic_auth_type])
is_expected.to contain_ironic_inspector_config('ironic/username').with_value(p[:ironic_username])
is_expected.to contain_ironic_inspector_config('ironic/project_name').with_value(p[:ironic_tenant_name])
is_expected.to contain_ironic_inspector_config('ironic/project_domain_name').with_value('Default')
is_expected.to contain_ironic_inspector_config('ironic/user_domain_name').with_value('Default')
is_expected.to contain_ironic_inspector_config('ironic/auth_url').with_value(p[:ironic_auth_url])
is_expected.to contain_ironic_inspector_config('ironic/max_retries').with_value(p[:ironic_max_retries])
is_expected.to contain_ironic_inspector_config('ironic/retry_interval').with_value(p[:ironic_retry_interval])
is_expected.to contain_ironic_inspector_config('swift/auth_type').with_value(p[:swift_auth_type])
is_expected.to contain_ironic_inspector_config('swift/username').with_value(p[:swift_username])
is_expected.to contain_ironic_inspector_config('swift/project_name').with_value(p[:swift_tenant_name])
is_expected.to contain_ironic_inspector_config('swift/project_domain_name').with_value('Default')
is_expected.to contain_ironic_inspector_config('swift/user_domain_name').with_value('Default')
is_expected.to contain_ironic_inspector_config('swift/auth_url').with_value(p[:swift_auth_url])
is_expected.to contain_ironic_inspector_config('processing/processing_hooks').with_value('$default_processing_hooks')
is_expected.to contain_ironic_inspector_config('processing/node_not_found_hook').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_inspector_config('discovery/enroll_node_driver').with_value('<SERVICE DEFAULT>')
@@ -219,14 +195,6 @@ describe 'ironic::inspector' do
:dhcp_debug => true,
:listen_address => '127.0.0.1',
:api_max_limit => 100,
:ironic_password => 'password',
:ironic_project_domain_name => 'Default',
:ironic_user_domain_name => 'Default',
:ironic_auth_url => 'http://192.168.0.1:5000/v3',
:swift_password => 'password',
:swift_project_domain_name => 'Default',
:swift_user_domain_name => 'Default',
:swift_auth_url => 'http://192.168.0.1:5000/v3',
:pxe_transfer_protocol => 'http',
:additional_processing_hooks => 'hook1,hook2',
:ramdisk_kernel_args => 'foo=bar',
@@ -249,14 +217,6 @@ describe 'ironic::inspector' do
is_expected.to contain_ironic_inspector_config('DEFAULT/listen_address').with_value(p[:listen_address])
is_expected.to contain_ironic_inspector_config('DEFAULT/api_max_limit').with_value(100)
is_expected.to contain_ironic_inspector_config('capabilities/boot_mode').with_value(p[:detect_boot_mode])
is_expected.to contain_ironic_inspector_config('ironic/password').with_value(p[:ironic_password]).with_secret(true)
is_expected.to contain_ironic_inspector_config('ironic/project_domain_name').with_value(p[:ironic_project_domain_name])
is_expected.to contain_ironic_inspector_config('ironic/user_domain_name').with_value(p[:ironic_user_domain_name])
is_expected.to contain_ironic_inspector_config('ironic/auth_url').with_value(p[:ironic_auth_url])
is_expected.to contain_ironic_inspector_config('swift/password').with_value(p[:swift_password]).with_secret(true)
is_expected.to contain_ironic_inspector_config('swift/project_domain_name').with_value(p[:swift_project_domain_name])
is_expected.to contain_ironic_inspector_config('swift/user_domain_name').with_value(p[:swift_user_domain_name])
is_expected.to contain_ironic_inspector_config('swift/auth_url').with_value(p[:swift_auth_url])
is_expected.to contain_ironic_inspector_config('processing/processing_hooks').with_value('$default_processing_hooks,hook1,hook2')
is_expected.to contain_ironic_inspector_config('processing/node_not_found_hook').with_value('enroll')
is_expected.to contain_ironic_inspector_config('processing/add_ports').with_value('all')