Merge "Get rid of the $pyvers variable"
This commit is contained in:
commit
9f12d78a9d
|
@ -4,7 +4,6 @@
|
||||||
#
|
#
|
||||||
class murano::params {
|
class murano::params {
|
||||||
include openstacklib::defaults
|
include openstacklib::defaults
|
||||||
$pyvers = $::openstacklib::defaults::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'
|
||||||
|
@ -12,7 +11,7 @@ class murano::params {
|
||||||
# service names
|
# service names
|
||||||
$api_service_name = 'murano-api'
|
$api_service_name = 'murano-api'
|
||||||
$engine_service_name = 'murano-engine'
|
$engine_service_name = 'murano-engine'
|
||||||
$pythonclient_package_name = "python${pyvers}-muranoclient"
|
$pythonclient_package_name = 'python3-muranoclient'
|
||||||
$group = 'murano'
|
$group = 'murano'
|
||||||
|
|
||||||
case $::osfamily {
|
case $::osfamily {
|
||||||
|
@ -34,7 +33,7 @@ class murano::params {
|
||||||
$cfapi_package_name = 'murano-cfapi'
|
$cfapi_package_name = 'murano-cfapi'
|
||||||
$common_package_name = 'murano-common'
|
$common_package_name = 'murano-common'
|
||||||
$engine_package_name = 'murano-engine'
|
$engine_package_name = 'murano-engine'
|
||||||
$dashboard_package_name = "python${pyvers}-murano-dashboard"
|
$dashboard_package_name = 'python3-murano-dashboard'
|
||||||
# service names
|
# service names
|
||||||
$cfapi_service_name = 'murano-cfapi'
|
$cfapi_service_name = 'murano-cfapi'
|
||||||
# dashboard config file
|
# dashboard config file
|
||||||
|
|
|
@ -29,15 +29,7 @@ describe 'murano::client' do
|
||||||
when 'Debian'
|
when 'Debian'
|
||||||
{ :pythonclient_package_name => 'python3-muranoclient' }
|
{ :pythonclient_package_name => 'python3-muranoclient' }
|
||||||
when 'RedHat'
|
when 'RedHat'
|
||||||
if facts[:operatingsystem] == 'Fedora'
|
{ :pythonclient_package_name => 'python3-muranoclient' }
|
||||||
{ :pythonclient_package_name => 'python3-muranoclient' }
|
|
||||||
else
|
|
||||||
if facts[:operatingsystemmajrelease] > '7'
|
|
||||||
{ :pythonclient_package_name => 'python3-muranoclient' }
|
|
||||||
else
|
|
||||||
{ :pythonclient_package_name => 'python-muranoclient' }
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue