openstack/puppet-horizon
Code Issues Proposed changes

Expect python3 package in CentOS8 and Fedora

Browse Source 
In CentOS 8.x and Fedora, we expect to have python3 package, while we
expect to have python2 in 7.x .
Fix unit tests to expect the correct version according to os major
version.

Change-Id: I298706690ee73db76678653841514de120c61e27
This commit is contained in:
Takashi Kajinami 2020-04-10 00:38:11 +09:00
parent 0585062ab2
commit faaaa4a773
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
spec/classes/horizon_init_spec.rb
View File

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