openstack
/
fuel-library
Code Issues Proposed changes

Dig vips out from network metadata 

In order to prevent the refer to an empty vips for virt/compute roles
(there are no controllers in cluster yet) fallback to default values.

Change-Id: Ic6dfebd2b032f59312b0f0af60d99db6d28763d7
Closes-Bug: #1566796
This commit is contained in:
Michael Polenchuk 2016-04-07 17:06:07 +03:00
parent f8163d3532
commit 1ddd22a114
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
deployment/puppet/osnailyfacter/manifests/globals/globals.pp
View File

@ -235,20 +235,20 @@ class osnailyfacter::globals::globals {
)
$default_gateway = get_default_gateways()
$public_vip = $network_metadata['vips']['public']['ipaddr']
$management_vip = $network_metadata['vips']['management']['ipaddr']
$public_vrouter_vip = $network_metadata['vips']['vrouter_pub']['ipaddr']
$management_vrouter_vip = $network_metadata['vips']['vrouter']['ipaddr']
$vips = $network_metadata['vips']
$database_vip = is_hash($network_metadata['vips']['database']) ? {
true => pick($network_metadata['vips']['database']['ipaddr'], $management_vip),
default => $management_vip
}
$service_endpoint = is_hash($network_metadata['vips']['service_endpoint']) ? {
true => pick($network_metadata['vips']['service_endpoint']['ipaddr'], $management_vip),
default => $management_vip
}
# TODO(mpolenchuk): try_get_value() is deprecated,
# replace with dig() once stdlib 4.12 will be available
$public_vip = try_get_value($vips, 'public/ipaddr',
get_network_role_property('public/vip', 'ipaddr')
)
$management_vip = try_get_value($vips, 'management/ipaddr',
get_network_role_property('mgmt/vip', 'ipaddr')
)
$public_vrouter_vip = try_get_value($vips, 'vrouter_pub/ipaddr', undef)
$management_vrouter_vip = try_get_value($vips, 'vrouter/ipaddr', undef)
$database_vip = try_get_value($vips, 'database/ipaddr', $management_vip)
$service_endpoint = try_get_value($vips, 'service_endpoint/ipaddr', $management_vip)
if $use_neutron {
$novanetwork_params = {}