openstack/puppet-horizon
Code Issues Proposed changes

Inherit pyvers from openstacklib::defaults

Browse Source 
Change-Id: Ie7e1a23de1017d06456f712c6a5d55a0b07b8fdc
This commit is contained in:
Tobias Urdin
2019-01-17 21:34:11 +01:00
parent 1f4f96d97e
commit d1703e6a76
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/params.pp
View File

@@ -2,6 +2,7 @@
# should be considered to be constant
class horizon::params {
include ::openstacklib::defaults
$pyvers = $::openstacklib::defaults::pyvers
$logdir = '/var/log/horizon'
$django_wsgi = '/usr/share/openstack-dashboard/openstack_dashboard/wsgi.py'
@@ -22,7 +23,7 @@ class horizon::params {
$apache_group = 'apache'
$wsgi_user = 'apache'
$wsgi_group = 'apache'
$memcache_package = 'python-memcached'
$memcache_package = "python${pyvers}-memcached"
}
'Debian': {
$http_service = 'apache2'
@@ -34,16 +35,15 @@ class horizon::params {
$apache_group = 'www-data'
$wsgi_user = 'horizon'
$wsgi_group = 'horizon'
$memcache_package = "python${pyvers}-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'
}
}
}

2
spec/classes/horizon_init_spec.rb
View File

@@ -740,7 +740,7 @@ describe 'horizon' do
:package_name => 'openstack-dashboard',
:root_url => '/horizon',
:root_path => '/var/lib/openstack-dashboard',
:memcache_package => 'python-memcache',
:memcache_package => 'python3-memcache',
}
end
when 'RedHat'