Rename murano hash to murano_plugin hash

Current murano hash name intersects with base Fuel murano hash name.
As a result base fuel task globals update base hiera yaml file
with wrong data, that can lead problems, for example, during downscale
cluster.

Change-Id: I8b4b95b1706c277b4ee0606ce0420c0024a3e271
Closes-bug: #1598177
This commit is contained in:
Denis Egorenko 2016-07-01 17:11:58 +03:00
parent 05a64c606e
commit f44e7081fa
9 changed files with 12 additions and 13 deletions

View File

@ -2,7 +2,7 @@ notice('MURANO PLUGIN: murano.pp')
prepare_network_config(hiera_hash('network_scheme', {}))
$murano_hash = hiera_hash('murano', {})
$murano_hash = hiera_hash('murano_plugin', {})
$murano_plugins = pick($murano_hash['plugins'], {})
$rabbit_hash = hiera_hash('rabbit', {})
$neutron_config = hiera_hash('neutron_config', {})

View File

@ -3,7 +3,7 @@ notice('MURANO PLUGIN: murano_cfapi.pp')
prepare_network_config(hiera_hash('network_scheme', {}))
$access_hash = hiera_hash('access', {})
$murano_cfapi_hash = hiera_hash('murano_cfapi', {})
$murano_cfapi_hash = hiera_hash('murano_cfapi_plugin', {})
$public_ip = hiera('public_vip')
$management_ip = hiera('management_vip')
$public_ssl_hash = hiera_hash('public_ssl', {})

View File

@ -1,6 +1,6 @@
notice('MURANO PLUGIN: murano_dashboard.pp')
$murano_hash = hiera_hash('murano', {})
$murano_hash = hiera_hash('murano_plugin', {})
$murano_plugins = $murano_hash['plugins']
$repository_url = has_key($murano_hash, 'murano_repo_url') ? {
true => $murano_hash['murano_repo_url'],

View File

@ -1,6 +1,6 @@
notice('MURANO PLUGIN: murano_db.pp')
$murano_hash = hiera_hash('murano', {})
$murano_hash = hiera_hash('murano_plugin', {})
$mysql_hash = hiera_hash('mysql', {})
$management_vip = hiera('management_vip', undef)
$database_vip = hiera('database_vip')

View File

@ -1,7 +1,7 @@
notice('MURANO PLUGIN: murano_haproxy.pp')
$murano_hash = hiera_hash('murano',{})
$murano_cfapi_hash = hiera_hash('murano_cfapi', {})
$murano_hash = hiera_hash('murano_plugin',{})
$murano_cfapi_hash = hiera_hash('murano_cfapi_plugin', {})
$public_ssl_hash = hiera_hash('public_ssl', {})
$ssl_hash = hiera_hash('use_ssl', {})
$external_lb = hiera('external_lb', false)

View File

@ -42,8 +42,7 @@ if $murano_plugin {
###################
$calculated_content = inline_template('
murano:
murano_old_config: <% @murano_base_hash %>
murano_plugin:
murano_standalone: <%= @murano_role_exists %>
murano_ipaddresses:
<%
@ -64,7 +63,7 @@ murano:
plugins:
glance_artifacts_plugin:
enabled: <%= @murano_glance_artifacts %>
murano_cfapi:
murano_cfapi_plugin:
enabled: <%= @murano_cfapi_enabled %>
syslog_log_facility_murano: <%= @syslog_log_facility_murano %>
"murano::logging::default_log_levels":

View File

@ -1,7 +1,7 @@
notice('MURANO PLUGIN: murano_keystone.pp')
$murano_hash = hiera_hash('murano', {})
$murano_cfapi_hash = hiera_hash('murano_cfapi', {})
$murano_hash = hiera_hash('murano_plugin', {})
$murano_cfapi_hash = hiera_hash('murano_cfapi_plugin', {})
$public_ip = hiera('public_vip')
$management_ip = hiera('management_vip')
$region = hiera('region', 'RegionOne')

View File

@ -1,7 +1,7 @@
notice('MODULAR: murano_rabbitmq.pp')
$rabbit_hash = hiera_hash('rabbit', {})
$murano_hash = hiera_hash('murano', {})
$murano_hash = hiera_hash('murano_plugin', {})
if $rabbit_hash == {} {
fail('No rabbit_hash defined')

View File

@ -1,6 +1,6 @@
notice('MURANO PLUGIN: update_openrc.pp')
$murano_hash = hiera_hash('murano', {})
$murano_hash = hiera_hash('murano_plugin', {})
$murano_plugins = $murano_hash['plugins']
$murano_repo_url = $murano_hash['murano_repo_url']