openstack/fuel-library
Code Issues Proposed changes

Merge "Possibility to detach VIPs from controllers"

Browse Source
This commit is contained in:
Jenkins 2015-06-24 12:28:01 +00:00 committed by Gerrit Code Review
commit 219a6ebf10
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
deployment/puppet/osnailyfacter/modular/virtual_ips/virtual_ips.pp
View File

@ -4,10 +4,19 @@ $internal_int = hiera('internal_int')
$public_int = hiera('public_int', undef) $public_int = hiera('public_int', undef)
$primary_controller_nodes = hiera('primary_controller_nodes', false) $primary_controller_nodes = hiera('primary_controller_nodes', false)
$network_scheme = hiera('network_scheme', {}) $network_scheme = hiera('network_scheme', {})
$vip_management_cidr_netmask = netmask_to_cidr($primary_controller_nodes[0]['internal_netmask'])
$vip_public_cidr_netmask = netmask_to_cidr($primary_controller_nodes[0]['public_netmask'])
$use_neutron = hiera('use_neutron', false) $use_neutron = hiera('use_neutron', false)
if ( hiera('vip_management_cidr_netmask', false )){
$vip_management_cidr_netmask = hiera('vip_management_cidr_netmask')
} else {
$vip_management_cidr_netmask = netmask_to_cidr($primary_controller_nodes[0]['internal_netmask'])
}
if ( hiera('vip_public_cidr_netmask', false )){
$vip_public_cidr_netmask = hiera('vip_public_cidr_netmask')
} else {
$vip_public_cidr_netmask = netmask_to_cidr($primary_controller_nodes[0]['public_netmask'])
}
# todo:(sv): temporary commented. Will be uncommented while 'multiple-l2-network' feature re-implemented # todo:(sv): temporary commented. Will be uncommented while 'multiple-l2-network' feature re-implemented
# if $use_neutron { # if $use_neutron {
# ip_mgmt_other_nets = join($network_scheme['endpoints']["$internal_int"]['other_nets'], ' ') # ip_mgmt_other_nets = join($network_scheme['endpoints']["$internal_int"]['other_nets'], ' ')