Switch ensure_packages to ensure_resources for python-memcache
The ensure_packages resource forces ensure to present yielding duplicate definition errors if we override default Package ensure to latest. We should solve this by using ensure_resources which does not enforce this. Change-Id: I1e2ba2b4a8ab31c925bf31ac1838999fc37b268f Closes-Bug: #1644906 Resolves: rhbz#1392583
This commit is contained in:
parent
99e6cddbfc
commit
e0b9dd93e2
|
@ -156,11 +156,10 @@ define oslo::cache(
|
|||
tag => 'openstack',
|
||||
})
|
||||
} elsif ($backend =~ /\.memcache/ ) {
|
||||
ensure_packages('python-memcache', {
|
||||
ensure => present,
|
||||
ensure_resources('package', { 'python-memcache' => {
|
||||
name => $::oslo::params::python_memcache_package_name,
|
||||
tag => ['openstack'],
|
||||
})
|
||||
}})
|
||||
}
|
||||
|
||||
$cache_options = {
|
||||
|
|
|
@ -87,7 +87,6 @@ describe 'oslo::cache' do
|
|||
it 'configures cache backend' do
|
||||
is_expected.to contain_keystone_config('cache/backend').with_value('dogpile.cache.memcache')
|
||||
is_expected.to contain_package('python-memcache').with(
|
||||
:ensure => 'present',
|
||||
:name => platform_params[:python_memcache_package_name],
|
||||
:tag => ['openstack'],
|
||||
)
|
||||
|
|
Loading…
Reference in New Issue