openstack/puppet-oslo
Code Issues Proposed changes

coordination: Use consistent tag format for package resources

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

Closes-Bug: #2046317
Change-Id: I3d637b1c47ea17a565efb1d5e0b58ee701b21c8b
(cherry picked from commit 976418c9c2c3dc007ede50e67609e630e856464d)
(cherry picked from commit d31c007a87af5a53f0e6d822a4e291e572dac431)
This commit is contained in:
Takashi Kajinami 2023-12-13 14:09:22 +09:00
parent 4cc62f4423
commit 37c891eec4
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/coordination.pp
View File

@ -38,14 +38,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:\/\//: {
@ -54,7 +54,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.')
@ -64,7 +64,7 @@ define oslo::coordination (
ensure_packages('python-pymemcache', {
name => $::oslo::params::python_pymemcache_package_name,
ensure => $package_ensure,
tag => 'openstack',
tag => ['openstack'],
})
}
default: {

8
spec/defines/oslo_coordination_spec.rb
View File

@ -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