From 7168404bb5055dcf06fc9d463473970771248f37 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Tue, 8 Nov 2016 11:10:39 +0800 Subject: [PATCH] Fix common options position in params.pp These parameters are common for both systems, they could be moved out from 'case'. Change-Id: I91798798f5293a9fd13c2414c280f112eabc5a8b --- manifests/params.pp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 4c5ecd3..da0f88d 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -4,8 +4,13 @@ # class murano::params { include ::openstacklib::defaults + $dbmanage_command = 'murano-db-manage --config-file /etc/murano/murano.conf upgrade' $default_external_network = 'public' + # service names + $api_service_name = 'murano-api' + $cfapi_service_name = 'murano-cfapi' + $engine_service_name = 'murano-engine' case $::osfamily { 'RedHat': { @@ -16,10 +21,6 @@ class murano::params { $engine_package_name = 'openstack-murano-engine' $pythonclient_package_name = 'openstack-python-muranoclient' $dashboard_package_name = 'openstack-murano-dashboard' - # service names - $api_service_name = 'murano-api' - $cfapi_service_name = 'murano-cfapi' - $engine_service_name = 'murano-engine' # dashboard config file $local_settings_path = '/etc/openstack-dashboard/local_settings' } @@ -31,10 +32,6 @@ class murano::params { $engine_package_name = 'murano-engine' $pythonclient_package_name = 'python-muranoclient' $dashboard_package_name = 'python-murano-dashboard' - # service names - $api_service_name = 'murano-api' - $cfapi_service_name = 'murano-cfapi' - $engine_service_name = 'murano-engine' # dashboard config file $local_settings_path = '/etc/openstack-dashboard/local_settings.py' }