Allow empty additional config
Empty UI config now will be ignored Change-Id: I5b20d4a399d6af08b2c0791edaead70305d19f79 Closes-Bug: #1496519
This commit is contained in:
parent
d9073b7610
commit
6fb59cbae0
|
@ -11,10 +11,18 @@ if $detach_database_plugin {
|
||||||
fail('Database VIP is not defined')
|
fail('Database VIP is not defined')
|
||||||
}
|
}
|
||||||
$yaml_additional_config = pick($detach_database_plugin['yaml_additional_config'], {})
|
$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')
|
$nodes_hash = hiera('nodes')
|
||||||
$management_vip = hiera('management_vip')
|
$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
|
#Set database_nodes values
|
||||||
$database_roles = [ 'primary-standalone-database', 'standalone-database' ]
|
$database_roles = [ 'primary-standalone-database', 'standalone-database' ]
|
||||||
|
|
Loading…
Reference in New Issue