x
/
fuel-plugin-detach-database
Code Issues Proposed changes

Merge "Remove reference to fuel-plugin-detach-keystone"

This commit is contained in:
Jenkins 2015-10-13 15:32:49 +00:00 committed by Gerrit Code Review
parent 4f2bdd7948 d15afb45c0
commit 854c8bb848
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deployment_scripts/database_hiera_override.pp
View File

@ -12,7 +12,7 @@ if $detach_database_plugin {
}
$yaml_additional_config = pick($detach_database_plugin['yaml_additional_config'], {})
#TODO (holser): Redesign parseyaml and is_bool once [MODULES-2462] applied
$settings_hash = parseyaml($detach_keystone_plugin['yaml_additional_config'])
$settings_hash = parseyaml($detach_database_plugin['yaml_additional_config'])
if is_bool($settings_hash) {
$settings_hash_real = {}
@ -22,7 +22,7 @@ if $detach_database_plugin {
$nodes_hash = hiera('nodes')
$management_vip = hiera('management_vip')
$database_vip = pick($settings_real_hash['remote_database'],$network_metadata['vips']['database']['ipaddr'])
$database_vip = pick($settings_hash_real['remote_database'],$network_metadata['vips']['database']['ipaddr'])
#Set database_nodes values
$database_roles = [ 'primary-standalone-database', 'standalone-database' ]