Install the correct memcache bindings for py3
Change-Id: I51184bb0153f2754dc6bc0d445020d218f6ecc3a
This commit is contained in:
parent
f4f18ec73b
commit
3fa63db938
|
@ -23,7 +23,7 @@ class keystone::params {
|
||||||
$package_name = 'openstack-keystone'
|
$package_name = 'openstack-keystone'
|
||||||
$service_name = 'openstack-keystone'
|
$service_name = 'openstack-keystone'
|
||||||
$keystone_wsgi_script_path = '/var/www/cgi-bin/keystone'
|
$keystone_wsgi_script_path = '/var/www/cgi-bin/keystone'
|
||||||
$python_memcache_package_name = 'python-memcached'
|
$python_memcache_package_name = "python${pyvers}-memcached"
|
||||||
$mellon_package_name = 'mod_auth_mellon'
|
$mellon_package_name = 'mod_auth_mellon'
|
||||||
$openidc_package_name = 'mod_auth_openidc'
|
$openidc_package_name = 'mod_auth_openidc'
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
fixes:
|
||||||
|
- |
|
||||||
|
Fixed a bug where the keystone::resource::authtoken resource would not
|
||||||
|
install the proper python memcache bindings when using python3.
|
|
@ -211,7 +211,15 @@ describe 'keystone::resource::authtoken' do
|
||||||
when 'Debian'
|
when 'Debian'
|
||||||
memcache_package_name = 'python3-memcache'
|
memcache_package_name = 'python3-memcache'
|
||||||
when 'RedHat'
|
when 'RedHat'
|
||||||
memcache_package_name = 'python-memcached'
|
if facts[:operatingsystem] == 'Fedora'
|
||||||
|
memcache_package_name = 'python3-memcached'
|
||||||
|
else
|
||||||
|
if facts[:operatingsystemmajrelease] > '7'
|
||||||
|
memcache_package_name = 'python3-memcached'
|
||||||
|
else
|
||||||
|
memcache_package_name = 'python-memcached'
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
{
|
{
|
||||||
:memcache_package_name => memcache_package_name
|
:memcache_package_name => memcache_package_name
|
||||||
|
|
Loading…
Reference in New Issue