openstack/puppet-ironic
Code Issues Proposed changes

inspector: Use ironic-inspector user by default

Browse Source 
The warning to prepare for the migration was added a few years ago[1],
and we are now ready to complete the migration.

[1] 2eaa4e1aa0

Change-Id: I26dba6c72651d61a888e4579cced2e3139aab86a
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-08-24 03:00:08 +09:00
parent 9f9d0858f0
commit 70763fe1bc
9 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/inspector/authtoken.pp
View File

@@ -9,7 +9,7 @@
#
# [*username*]
# (Optional) The name of the service user
# Defaults to 'ironic'
# Defaults to 'ironic-inspector'
#
# [*auth_url*]
# (Optional) The URL to use for authentication.
@@ -196,7 +196,7 @@
#
class ironic::inspector::authtoken (
String[1] $password,
$username = 'ironic',
$username = 'ironic-inspector',
$auth_url = 'http://127.0.0.1:5000',
$project_name = 'services',
$user_domain_name = 'Default',
@@ -236,10 +236,6 @@ class ironic::inspector::authtoken (
) {
include ironic::deps
if $username == 'ironic' {
warning('The default username will be changed to ironic-inspector in a future release')
}
keystone::resource::authtoken {
'ironic_inspector_config':
* => $params;

8
manifests/inspector/ironic.pp
View File

@@ -29,7 +29,7 @@
#
# [*username*]
# (Optional) The admin username for ironic-inspector to connect to ironic.
# Defaults to 'ironic'.
# Defaults to 'ironic-inspector'.
#
# [*user_domain_name*]
# (Optional) The name of user's domain.
@@ -65,7 +65,7 @@ class ironic::inspector::ironic (
$auth_type = 'password',
$auth_url = 'http://127.0.0.1:5000',
$project_name = 'services',
$username = 'ironic',
$username = 'ironic-inspector',
$user_domain_name = 'Default',
$project_domain_name = 'Default',
$system_scope = $facts['os_service_default'],
@@ -74,9 +74,7 @@ class ironic::inspector::ironic (
$max_retries = $facts['os_service_default'],
$retry_interval = $facts['os_service_default'],
) {
if $username == 'ironic' {
warning('The default username will be changed to ironic-inspector in a future release')
}
include ironic::deps
if is_service_default($system_scope) {
$project_name_real = $project_name

8
manifests/inspector/service_catalog.pp
View File

@@ -32,7 +32,7 @@
# [*username*]
# (Optional) The admin username for ironic-inspector to connect to
# the service catalog.
# Defaults to 'ironic'.
# Defaults to 'ironic-inspector'.
#
# [*user_domain_name*]
# (Optional) The name of user's domain.
@@ -60,7 +60,7 @@ class ironic::inspector::service_catalog (
$auth_type = 'password',
$auth_url = 'http://127.0.0.1:5000',
$project_name = 'services',
$username = 'ironic',
$username = 'ironic-inspector',
$user_domain_name = 'Default',
$project_domain_name = 'Default',
$system_scope = $facts['os_service_default'],
@@ -69,10 +69,6 @@ class ironic::inspector::service_catalog (
) {
include ironic::deps
if $username == 'ironic' {
warning('The default username will be changed to ironic-inspector in a future release')
}
if is_service_default($system_scope) {
$project_name_real = $project_name
$project_domain_name_real = $project_domain_name

8
manifests/inspector/swift.pp
View File

@@ -30,7 +30,7 @@
#
# [*username*]
# (Optional) The admin username for ironic-inspector to connect to swift.
# Defaults to 'ironic'.
# Defaults to 'ironic-inspector'.
#
# [*user_domain_name*]
# (Optional) The name of user's domain.
@@ -68,7 +68,7 @@ class ironic::inspector::swift (
$auth_type = 'password',
$auth_url = 'http://127.0.0.1:5000',
$project_name = 'services',
$username = 'ironic',
$username = 'ironic-inspector',
$user_domain_name = 'Default',
$project_domain_name = 'Default',
$system_scope = $facts['os_service_default'],
@@ -77,9 +77,7 @@ class ironic::inspector::swift (
$container = $facts['os_service_default'],
$delete_after = $facts['os_service_default'],
) {
if $username == 'ironic' {
warning('The default username will be changed to ironic-inspector in a future release')
}
include ironic::deps
if is_service_default($system_scope) {
$project_name_real = $project_name

10
releasenotes/notes/swift-to-ironic-inspector-user-complete-cb4f4e76fc02fe76.yaml Normal file
View File

@@ -0,0 +1,10 @@
---
upgrade:
- |
Default value of the username parameters in the following classes has been
changed from ``ironic`` to ``ironic-inspector``.
- ``ironic::inspector::authtoken``
- ``ironic::inspector::ironic``
- ``ironic::inspector::service_catalog``
- ``ironic::inspector::swift``

2
spec/classes/ironic_inspector_authtoken_spec.rb
View File

@@ -12,7 +12,7 @@ describe 'ironic::inspector::authtoken' do
it 'configure keystone_authtoken' do
is_expected.to contain_keystone__resource__authtoken('ironic_inspector_config').with(
:username => 'ironic',
:username => 'ironic-inspector',
:password => 'ironic_password',
:auth_url => 'http://127.0.0.1:5000',
:project_name => 'services',

2
spec/classes/ironic_inspector_ironic_spec.rb
View File

@@ -26,7 +26,7 @@ describe 'ironic::inspector::ironic' do
is_expected.to contain_ironic_inspector_config('ironic/auth_type').with_value('password')
is_expected.to contain_ironic_inspector_config('ironic/auth_url').with_value('http://127.0.0.1:5000')
is_expected.to contain_ironic_inspector_config('ironic/project_name').with_value('services')
is_expected.to contain_ironic_inspector_config('ironic/username').with_value('ironic')
is_expected.to contain_ironic_inspector_config('ironic/username').with_value('ironic-inspector')
is_expected.to contain_ironic_inspector_config('ironic/password').with_value('secret').with_secret(true)
is_expected.to contain_ironic_inspector_config('ironic/user_domain_name').with_value('Default')
is_expected.to contain_ironic_inspector_config('ironic/project_domain_name').with_value('Default')

2
spec/classes/ironic_inspector_service_catalog_spec.rb
View File

@@ -26,7 +26,7 @@ describe 'ironic::inspector::service_catalog' do
is_expected.to contain_ironic_inspector_config('service_catalog/auth_type').with_value('password')
is_expected.to contain_ironic_inspector_config('service_catalog/auth_url').with_value('http://127.0.0.1:5000')
is_expected.to contain_ironic_inspector_config('service_catalog/project_name').with_value('services')
is_expected.to contain_ironic_inspector_config('service_catalog/username').with_value('ironic')
is_expected.to contain_ironic_inspector_config('service_catalog/username').with_value('ironic-inspector')
is_expected.to contain_ironic_inspector_config('service_catalog/password').with_value('secret').with_secret(true)
is_expected.to contain_ironic_inspector_config('service_catalog/user_domain_name').with_value('Default')
is_expected.to contain_ironic_inspector_config('service_catalog/project_domain_name').with_value('Default')

2
spec/classes/ironic_inspector_swift_spec.rb
View File

@@ -26,7 +26,7 @@ describe 'ironic::inspector::swift' do
is_expected.to contain_ironic_inspector_config('swift/auth_type').with_value('password')
is_expected.to contain_ironic_inspector_config('swift/auth_url').with_value('http://127.0.0.1:5000')
is_expected.to contain_ironic_inspector_config('swift/project_name').with_value('services')
is_expected.to contain_ironic_inspector_config('swift/username').with_value('ironic')
is_expected.to contain_ironic_inspector_config('swift/username').with_value('ironic-inspector')
is_expected.to contain_ironic_inspector_config('swift/password').with_value('secret').with_secret(true)
is_expected.to contain_ironic_inspector_config('swift/user_domain_name').with_value('Default')
is_expected.to contain_ironic_inspector_config('swift/project_domain_name').with_value('Default')