openstack
/
puppet-horizon
Code Issues Proposed changes

Get rid of the $pyvers variable 

Since everyone has switched to Python3, it's time for the removal of the
$pyvers variable.

Change-Id: Ia0d3a1083a6896685714e51266c250257d0ad0cf
This commit is contained in:
Thomas Goirand 2021-05-21 11:26:32 +02:00
parent 4bc6347e59
commit 1bee3966c7
2 changed files with 8 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/params.pp
View File

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

30
spec/classes/horizon_init_spec.rb
View File

@ -781,30 +781,12 @@ describe 'horizon' do
} }
end end
when 'RedHat' when 'RedHat'
if facts[:operatingsystem] == 'Fedora' { :config_file => '/etc/openstack-dashboard/local_settings',
{ :config_file => '/etc/openstack-dashboard/local_settings', :package_name => 'openstack-dashboard',
:package_name => 'openstack-dashboard', :root_url => '/dashboard',
:root_url => '/dashboard', :root_path => '/usr/share/openstack-dashboard',
:root_path => '/usr/share/openstack-dashboard', :memcache_package => 'python3-memcached',
:memcache_package => 'python3-memcached', }
}
else
if facts[:operatingsystemmajrelease] > '7'
{ :config_file => '/etc/openstack-dashboard/local_settings',
:package_name => 'openstack-dashboard',
:root_url => '/dashboard',
:root_path => '/usr/share/openstack-dashboard',
:memcache_package => 'python3-memcached',
}
else
{ :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
end end
end end