From 976418c9c2c3dc007ede50e67609e630e856464d Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Wed, 13 Dec 2023 14:09:22 +0900
Subject: [PATCH] coordination: Use consistent tag format for package resources

... to avoid conflicts with the other implementations which require
same packages.

Closes-Bug: #2046317
Change-Id: I3d637b1c47ea17a565efb1d5e0b58ee701b21c8b
---
 manifests/coordination.pp              | 8 ++++----
 spec/defines/oslo_coordination_spec.rb | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/manifests/coordination.pp b/manifests/coordination.pp
index 02ed85f..d048ffe 100644
--- a/manifests/coordination.pp
+++ b/manifests/coordination.pp
@@ -35,14 +35,14 @@ define oslo::coordination (
         ensure_packages('python-redis', {
           name   => $::oslo::params::python_redis_package_name,
           ensure => $package_ensure,
-          tag    => 'openstack',
+          tag    => ['openstack'],
         })
       }
       /^etcd3\+http[s]?:\/\//: {
         ensure_packages('python-etcd3gw', {
           name   => $::oslo::params::python_etcd3gw_package_name,
           ensure => $package_ensure,
-          tag    => 'openstack',
+          tag    => ['openstack'],
         })
       }
       /^etcd3:\/\//: {
@@ -51,7 +51,7 @@ define oslo::coordination (
           ensure_packages('python-etcd3', {
             name   => $::oslo::params::python_etcd3_package_name,
             ensure => $package_ensure,
-            tag    => 'openstack',
+            tag    => ['openstack'],
           })
         } else {
           warning('The python-etcd3 package is not available.')
@@ -61,7 +61,7 @@ define oslo::coordination (
         ensure_packages('python-pymemcache', {
           name   => $::oslo::params::python_pymemcache_package_name,
           ensure => $package_ensure,
-          tag    => 'openstack',
+          tag    => ['openstack'],
         })
       }
       default: {
diff --git a/spec/defines/oslo_coordination_spec.rb b/spec/defines/oslo_coordination_spec.rb
index e397fd7..69c3c75 100644
--- a/spec/defines/oslo_coordination_spec.rb
+++ b/spec/defines/oslo_coordination_spec.rb
@@ -23,7 +23,7 @@ describe 'oslo::coordination' do
         is_expected.to contain_package('python-redis').with(
           :name   => platform_params[:python_redis_package_name],
           :ensure => 'installed',
-          :tag    => 'openstack',
+          :tag    => ['openstack'],
         )
       end
 
@@ -52,7 +52,7 @@ describe 'oslo::coordination' do
           is_expected.to contain_package('python-etcd3').with(
             :name   => platform_params[:python_etcd3_package_name],
             :ensure => 'installed',
-            :tag    => 'openstack',
+            :tag    => ['openstack'],
           )
         else
           is_expected.to_not contain_package('python-etcd3')
@@ -129,7 +129,7 @@ describe 'oslo::coordination' do
         is_expected.to contain_package('python-pymemcache').with(
           :name   => platform_params[:python_pymemcache_package_name],
           :ensure => 'installed',
-          :tag    => 'openstack',
+          :tag    => ['openstack'],
         )
       end
 
@@ -158,7 +158,7 @@ describe 'oslo::coordination' do
         is_expected.to contain_package('python-redis').with(
           :name   => platform_params[:python_redis_package_name],
           :ensure => 'installed',
-          :tag    => 'openstack',
+          :tag    => ['openstack'],
         )
       end
     end