From 1e8d7472697b485cdb2775b1bf1507fbd8c701b9 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Mon, 20 Nov 2023 00:34:41 +0900
Subject: [PATCH] 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
---
 manifests/client.pp                | 2 +-
 manifests/deps.pp                  | 6 +++++-
 spec/classes/ironic_client_spec.rb | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/manifests/client.pp b/manifests/client.pp
index c0d1272c..895091f4 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -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
diff --git a/manifests/deps.pp b/manifests/deps.pp
index 30abc6b0..acc51d9f 100644
--- a/manifests/deps.pp
+++ b/manifests/deps.pp
@@ -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']
diff --git a/spec/classes/ironic_client_spec.rb b/spec/classes/ironic_client_spec.rb
index 8766fd7d..82e814ec 100644
--- a/spec/classes/ironic_client_spec.rb
+++ b/spec/classes/ironic_client_spec.rb
@@ -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