openstack
/
puppet-horizon
Code Issues Proposed changes

Debian is using python3-memcache 

Switch from python-memcache to python3-memcache for Debian.
Also uses openstack-dashboard-apache instead of simply
openstack-dashboard (ie: this package contains the Apache
config).

Change-Id: I9c316dd6b3abb758d73760f17b88a393776a873b
This commit is contained in:
Thomas Goirand 2018-04-06 23:02:15 +02:00
parent f627f1e771
commit efc265a85f
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/params.pp
View File

@ -34,15 +34,16 @@ class horizon::params {
$apache_group = 'www-data'
$wsgi_user = 'horizon'
$wsgi_group = 'horizon'
$memcache_package = 'python-memcache'
case $::os_package_type {
'debian': {
$package_name = 'openstack-dashboard-apache'
$httpd_config_file = '/etc/apache2/sites-available/openstack-dashboard-alias-only.conf'
$memcache_package = 'python3-memcache'
}
default: {
$package_name = 'openstack-dashboard'
$httpd_config_file = '/etc/apache2/conf-available/openstack-dashboard.conf'
$memcache_package = 'python-memcache'
}
}
}

32
spec/classes/horizon_init_spec.rb
View File

@ -251,7 +251,8 @@ describe 'horizon' do
it {
is_expected.to contain_package('python-memcache').with(
:tag => ['openstack', 'horizon-package']
:tag => ['openstack', 'horizon-package'],
:name => platforms_params[:memcache_package],
)
}
end
@ -659,16 +660,27 @@ describe 'horizon' do
let(:platforms_params) do
case facts[:osfamily]
when 'Debian'
{ :config_file => '/etc/openstack-dashboard/local_settings.py',
:package_name => 'openstack-dashboard',
:root_url => '/horizon',
:root_path => '/var/lib/openstack-dashboard',
}
if facts[:os_package_type] == 'debian'
{ :config_file => '/etc/openstack-dashboard/local_settings.py',
:package_name => 'openstack-dashboard-apache',
:root_url => '/horizon',
:root_path => '/var/lib/openstack-dashboard',
:memcache_package => 'python3-memcache',
}
else
{ :config_file => '/etc/openstack-dashboard/local_settings.py',
:package_name => 'openstack-dashboard',
:root_url => '/horizon',
:root_path => '/var/lib/openstack-dashboard',
:memcache_package => 'python-memcache',
}
end
when 'RedHat'
{ :config_file => '/etc/openstack-dashboard/local_settings',
:package_name => 'openstack-dashboard',
:root_url => '/dashboard',
:root_path => '/usr/share/openstack-dashboard',
{ :config_file => '/etc/openstack-dashboard/local_settings',
:package_name => 'openstack-dashboard',
:root_url => '/dashboard',
:root_path => '/usr/share/openstack-dashboard',
:memcache_package => 'python-memcached',
}
end
end