Merge "coordination: Use consistent tag format for package resources"

openstack/puppet-oslo

Code Issues Proposed changes

Browse Source

This commit is contained in:

Zuul

2023年12月15日 18:05:54 +00:00

committed by Gerrit Code Review

parent a878ebe071 976418c9c2

commit f27cf72079

2 changed files with 8 additions and 8 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/coordination.pp

View File

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

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