Use new openstackclient tag

The new openstackclient tag was added so that we can get all resources
about openstack CLI more easily. This adds this tag to ironicclient
because the plugin provides some sub-commands.

This also removes the support package tag because the client package is
not at all used by ironic itself.

In addition, openstackclient is needed to query keystone api when
transform in ironic_config is used.

Depends-on: https://review.opendev.org/899594
Change-Id: I46dcf0f8e7f9b72d27317d310bffdd25653a25cf
This commit is contained in:
Takashi Kajinami 2023-11-20 00:34:41 +09:00
parent 029df239fc
commit 1e8d747269
3 changed files with 7 additions and 3 deletions

View File

@ -36,7 +36,7 @@ class ironic::client (
package { 'python-ironicclient':
ensure => $package_ensure,
name => $::ironic::params::client_package,
tag => ['openstack', 'ironic-support-package'],
tag => ['openstack', 'openstackclient'],
}
include openstacklib::openstackclient

View File

@ -82,7 +82,11 @@ class ironic::deps {
-> Package<| tag == 'ironic-support-package'|>
-> Anchor['ironic-inspector::install::end']
# Installation or config changes will always restart services.
# openstackclient package is needed by transform
Package<| tag == 'openstackclient'|>
-> Anchor['ironic::config::begin']
# Installation or config changes will always restart services.
Anchor['ironic::install::end'] ~> Anchor['ironic::service::begin']
Anchor['ironic::config::end'] ~> Anchor['ironic::service::begin']
Anchor['ironic-inspector::install::end'] ~> Anchor['ironic-inspector::service::begin']

View File

@ -31,7 +31,7 @@ describe 'ironic::client' do
is_expected.to contain_package('python-ironicclient').with(
:ensure => 'present',
:name => platform_params[:client_package],
:tag => ['openstack', 'ironic-support-package']
:tag => ['openstack', 'openstackclient']
)
end