openstack
/
fuel-library
Code Issues Proposed changes

Merge "Change logic for setting murano_hash for plugins"

This commit is contained in:
Jenkins 2016-05-19 08:03:59 +00:00 committed by Gerrit Code Review
parent 91e4794e94 909c806b22
commit edbcf6cbf2
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
deployment/puppet/osnailyfacter/manifests/globals/globals.pp
View File

@ -70,7 +70,12 @@ class osnailyfacter::globals::globals {
$sahara_hash = hiera('sahara', {})
$murano = merge({'rabbit' => {'vhost' => '/', 'port' => '55572'}},
hiera('murano', {}))
$murano_glance_artifacts_plugin = hiera('murano_glance_artifacts_plugin', {})
$murano_settings = hiera('murano_settings', {})
if has_key($murano_settings, 'murano_glance_artifacts_plugin') {
$murano_glance_artifacts_plugin = { 'enabled' => $murano_settings['murano_glance_artifacts_plugin'] }
} else {
$murano_glance_artifacts_plugin = {}
}
$murano_hash = merge($murano, { 'plugins' => {'glance_artifacts_plugin' => $murano_glance_artifacts_plugin } })
$heat_hash = hiera_hash('heat', {})
$vcenter_hash = hiera('vcenter', {})