openstack/puppet-murano
Code Issues Proposed changes

Inherit pyvers from openstacklib::defaults

Browse Source 
Change-Id: Icdc346dd1f67ddb46e111ecd4a552bf2cb8380dd
This commit is contained in:
Tobias Urdin 2019-01-17 21:44:30 +01:00
parent 02986fd6a6
commit 7bd2b814aa
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/params.pp
View File

@ -4,13 +4,8 @@
# #
class murano::params { class murano::params {
include ::openstacklib::defaults include ::openstacklib::defaults
$pyvers = $::openstacklib::defaults::pyvers
if ($::os_package_type == 'debian') or ($::os['name'] == 'Fedora') or
($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
$pyvers = '3'
} else {
$pyvers = ''
}
$dbmanage_command = 'murano-db-manage --config-file /etc/murano/murano.conf upgrade' $dbmanage_command = 'murano-db-manage --config-file /etc/murano/murano.conf upgrade'
$cfapi_dbmanage_command = 'murano-cfapi-db-manage --config-file /etc/murano/murano-cfapi.conf upgrade' $cfapi_dbmanage_command = 'murano-cfapi-db-manage --config-file /etc/murano/murano-cfapi.conf upgrade'
$default_external_network = 'public' $default_external_network = 'public'

4
spec/classes/murano_client_spec.rb
View File

@ -27,11 +27,7 @@ describe 'murano::client' do
let :platform_params do let :platform_params do
case facts[:osfamily] case facts[:osfamily]
when 'Debian' when 'Debian'
if facts[:os_package_type] == 'debian'
{ :pythonclient_package_name => 'python3-muranoclient' } { :pythonclient_package_name => 'python3-muranoclient' }
else
{ :pythonclient_package_name => 'python-muranoclient' }
end
when 'RedHat' when 'RedHat'
{ :pythonclient_package_name => 'python-muranoclient' } { :pythonclient_package_name => 'python-muranoclient' }
end end

2
spec/classes/murano_dashboard_spec.rb
View File

@ -151,7 +151,7 @@ describe 'murano::dashboard' do
case facts[:osfamily] case facts[:osfamily]
when 'Debian' when 'Debian'
{ {
:dashboard_package_name => 'python-murano-dashboard', :dashboard_package_name => 'python3-murano-dashboard',
:dashboard_config => '/etc/openstack-dashboard/local_settings.py' :dashboard_config => '/etc/openstack-dashboard/local_settings.py'
} }
when 'RedHat' when 'RedHat'