openstack
/
fuel-library
Code Issues Proposed changes

Change logic for setting murano_hash for plugins 

Fuel-web changes I8ebac4405a1eaede18a35acbbab7b202b6aac754 and
Ieaa373d52403b834aa17eeb05a70b37c61454ad0 changed location for
'murano_glance_artifacts_plugin' setting. It has been moved
from the 'additional_components' group to the 'murano_settings'
group, hence we need update library as well.

The most easier way is to change logic for setting murano_hash in
global task, then we don't need to change modular task at all.

Change-Id: I4af71abb494d5ee2b3816a7e840fb2c3caf55d63
Closes-bug: #1581592
(cherry picked from commit 909c806b22)
This commit is contained in:
Denis Egorenko 2016-05-17 17:19:45 +03:00 committed by Ivan Berezovskiy
parent 5c0723548b
commit 3c3a679f27
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', {})