openstack/puppet-murano
Code Issues Proposed changes

Merge "Fix common options position in params.pp"

Browse Source
This commit is contained in:
Jenkins 2016-11-15 03:28:01 +00:00 committed by Gerrit Code Review
commit d675f63f08
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manifests/params.pp
View File

@ -4,8 +4,13 @@
# #
class murano::params { class murano::params {
include ::openstacklib::defaults include ::openstacklib::defaults
$dbmanage_command = 'murano-db-manage --config-file /etc/murano/murano.conf upgrade' $dbmanage_command = 'murano-db-manage --config-file /etc/murano/murano.conf upgrade'
$default_external_network = 'public' $default_external_network = 'public'
# service names
$api_service_name = 'murano-api'
$cfapi_service_name = 'murano-cfapi'
$engine_service_name = 'murano-engine'
case $::osfamily { case $::osfamily {
'RedHat': { 'RedHat': {
@ -16,10 +21,6 @@ class murano::params {
$engine_package_name = 'openstack-murano-engine' $engine_package_name = 'openstack-murano-engine'
$pythonclient_package_name = 'openstack-python-muranoclient' $pythonclient_package_name = 'openstack-python-muranoclient'
$dashboard_package_name = 'openstack-murano-dashboard' $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 # dashboard config file
$local_settings_path = '/etc/openstack-dashboard/local_settings' $local_settings_path = '/etc/openstack-dashboard/local_settings'
} }
@ -31,10 +32,6 @@ class murano::params {
$engine_package_name = 'murano-engine' $engine_package_name = 'murano-engine'
$pythonclient_package_name = 'python-muranoclient' $pythonclient_package_name = 'python-muranoclient'
$dashboard_package_name = 'python-murano-dashboard' $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 # dashboard config file
$local_settings_path = '/etc/openstack-dashboard/local_settings.py' $local_settings_path = '/etc/openstack-dashboard/local_settings.py'
} }