From 6fb59cbae0d3cd41ae21ed813470280694110daf Mon Sep 17 00:00:00 2001 From: Matthew Mosesohn Date: Wed, 23 Sep 2015 20:07:19 +0300 Subject: [PATCH] Allow empty additional config Empty UI config now will be ignored Change-Id: I5b20d4a399d6af08b2c0791edaead70305d19f79 Closes-Bug: #1496519 --- deployment_scripts/database_hiera_override.pp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/deployment_scripts/database_hiera_override.pp b/deployment_scripts/database_hiera_override.pp index 406300c..5c53edb 100644 --- a/deployment_scripts/database_hiera_override.pp +++ b/deployment_scripts/database_hiera_override.pp @@ -11,10 +11,18 @@ if $detach_database_plugin { fail('Database VIP is not defined') } $yaml_additional_config = pick($detach_database_plugin['yaml_additional_config'], {}) - $settings_hash = parseyaml($yaml_additional_config) + #TODO (holser): Redesign parseyaml and is_bool once [MODULES-2462] applied + $settings_hash = parseyaml($detach_keystone_plugin['yaml_additional_config']) + + if is_bool($settings_hash) { + $settings_hash_real = {} + } else { + $settings_hash_real = $settings_hash + } + $nodes_hash = hiera('nodes') $management_vip = hiera('management_vip') - $database_vip = pick($settings_hash['remote_database'],$network_metadata['vips']['database']['ipaddr']) + $database_vip = pick($settings_real_hash['remote_database'],$network_metadata['vips']['database']['ipaddr']) #Set database_nodes values $database_roles = [ 'primary-standalone-database', 'standalone-database' ]