diff --git a/deployment_scripts/hiera-override.pp b/deployment_scripts/hiera-override.pp
index 11944a2..73fe65c 100644
--- a/deployment_scripts/hiera-override.pp
+++ b/deployment_scripts/hiera-override.pp
@@ -14,22 +14,15 @@ if $detach_keystone_plugin {
     fail('Keystone service endpoint public VIP is not defined')
   }
 
-  #TODO (holser): Redesign parseyaml and is_bool once [MODULES-2462] applied
-  $settings_hash       = parseyaml($detach_keystone_plugin['yaml_additional_config'])
+  $settings_hash       = parseyaml($detach_keystone_plugin['yaml_additional_config'], {})
 
-  if is_bool($settings_hash) {
-    $settings_hash_real = {}
-  } else {
-    $settings_hash_real = $settings_hash
-  }
-
-  $keystone_vip        = pick($settings_hash_real['remote_keystone'],
+  $keystone_vip        = pick($settings_hash['remote_keystone'],
                               $network_metadata['vips']['service_endpoint']['ipaddr'])
 
-  $public_keystone_vip = pick($settings_hash_real['remote_keystone'],
+  $public_keystone_vip = pick($settings_hash['remote_keystone'],
                               $network_metadata['vips']['public_service_endpoint']['ipaddr'])
 
-  $nodes_hash          = hiera('nodes')
+  $nodes_hash          = $network_metadata['nodes']
   $keystone_roles       =  ['primary-standalone-keystone',
     'standalone-keystone']
   $keystone_nodes       = get_nodes_hash_by_roles($network_metadata,