From 52c37b82fcb7dd42e7bcd80d9265d8707047c23b Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Mon, 20 Nov 2023 00:25:51 +0900
Subject: [PATCH] Use new openstackclient tag

This looses dependency using the new openstackclient tag, which
requires only packages actually related to openstack CLI.

Depends-on: https://review.opendev.org/899594
Change-Id: I512e1ca72004c5265806d342f5a6f101682c85a8
---
 manifests/client.pp                | 2 +-
 manifests/deps.pp                  | 4 ++--
 spec/classes/sahara_client_spec.rb | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/manifests/client.pp b/manifests/client.pp
index cb935267..daf03734 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -18,7 +18,7 @@ class sahara::client (
   package { 'python-saharaclient':
     ensure => $package_ensure,
     name   => $::sahara::params::client_package_name,
-    tag    => 'openstack',
+    tag    => ['openstack', 'openstackclient'],
   }
 
   include openstacklib::openstackclient
diff --git a/manifests/deps.pp b/manifests/deps.pp
index 0c90ac76..9462970d 100644
--- a/manifests/deps.pp
+++ b/manifests/deps.pp
@@ -47,8 +47,8 @@ class sahara::deps {
   # will have clients available to create resources. This tag handles the
   # openstackclient but indirectly since the client is not available in
   # all catalogs that don't need the client class (like many spec tests)
-  Package<| tag == 'openstack'|>
-  ~> Anchor['sahara::service::end']
+  Package<| tag == 'openstackclient'|>
+  -> Anchor['sahara::service::end']
 
   # Installation or config changes will always restart services.
   Anchor['sahara::install::end'] ~> Anchor['sahara::service::begin']
diff --git a/spec/classes/sahara_client_spec.rb b/spec/classes/sahara_client_spec.rb
index 4999b54e..1429b701 100644
--- a/spec/classes/sahara_client_spec.rb
+++ b/spec/classes/sahara_client_spec.rb
@@ -13,7 +13,7 @@ describe 'sahara::client' do
     context 'with default parameters' do
       it { is_expected.to contain_package('python-saharaclient').with(
         :ensure => 'present',
-        :tag    => 'openstack',
+        :tag    => ['openstack', 'openstackclient'],
         )
       }
     end
@@ -25,7 +25,7 @@ describe 'sahara::client' do
       it { is_expected.to contain_package('python-saharaclient').with(
         :ensure => false,
         :name   => platform_params[:client_package_name],
-        :tag    => 'openstack',
+        :tag    => ['openstack', 'openstackclient'],
         )
       }
     end