openstack/puppet-horizon
Code Issues Proposed changes

Fix dashboard resource

Browse Source 
With ubuntu switching to python3, we no longer need to have logic to
handle python2/python3 for the dashboard packages.

Change-Id: I14102f6defe00fe43aa897831072cae22e0e19d5
This commit is contained in:
Alex Schultz 2019-04-24 11:19:00 -06:00
parent 3eccf6586b
commit daddecad47
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/dashboard.pp
View File

@ -39,10 +39,7 @@ define horizon::dashboard (
case $::osfamily {
'Debian': {
$dashboard_package_name = $::os_package_type ? {
'debian' => "python3-${dashboard}-dashboard",
default => "python-${dashboard}-dashboard"
}
$dashboard_package_name = "python3-${dashboard}-dashboard"
}
'RedHat': {
$dashboard_package_name = "openstack-${dashboard}-ui"

9
spec/defines/horizon_dashboard_spec.rb
View File

@ -59,7 +59,7 @@ describe 'horizon::dashboard' do
shared_examples 'horizon::dashboard on Ubuntu' do
context 'with default' do
it { should contain_package('python-heat-dashboard').with(
it { should contain_package('python3-heat-dashboard').with(
:ensure => 'present',
:tag => ['horizon-dashboard-package']
)}
@ -77,12 +77,7 @@ describe 'horizon::dashboard' do
let(:platform_params) do
case facts[:osfamily]
when 'Debian'
if facts[:os_package_type] == 'debian'
pkg = 'python3-heat-dashboard'
else
pkg = 'python-heat-dashboard'
end
{ :heat_dashboard_package_name => pkg }
{ :heat_dashboard_package_name => 'python3-heat-dashboard' }
when 'RedHat'
{ :heat_dashboard_package_name => 'openstack-heat-ui' }
end