Merge "Consolidate python memcache bindings install"
This commit is contained in:
commit
6647a614f4
|
@ -637,9 +637,10 @@ release. Use log_handlers instead')
|
|||
validate_legacy(Stdlib::Absolutepath, 'validate_absolute_path', $root_path)
|
||||
|
||||
if $manage_memcache_package and $cache_backend =~ /MemcachedCache/ {
|
||||
ensure_resources('package', { 'python-memcache' =>
|
||||
{ name => $::horizon::params::memcache_package,
|
||||
tag => ['openstack', 'horizon-package']}})
|
||||
ensure_packages('python-memcache', {
|
||||
name => $::horizon::params::memcache_package,
|
||||
tag => ['openstack'],
|
||||
})
|
||||
}
|
||||
|
||||
package { 'horizon':
|
||||
|
|
|
@ -297,7 +297,7 @@ describe 'horizon' do
|
|||
|
||||
it {
|
||||
is_expected.to contain_package('python-memcache').with(
|
||||
:tag => ['openstack', 'horizon-package'],
|
||||
:tag => ['openstack'],
|
||||
:name => platforms_params[:memcache_package],
|
||||
)
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue