From 0a7c4d561ee4c378ef22954ba18b16f9a8c0443b Mon Sep 17 00:00:00 2001 From: Nikita Koshikov Date: Fri, 5 Jun 2015 09:38:36 -0500 Subject: [PATCH] Possibility to detach VIPs from controllers Partial blueprint: detach-components-from-controllers Change-Id: I761b80aabf8b7e24cbeaaaf234421c5bf57315d3 --- .../modular/virtual_ips/virtual_ips.pp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/deployment/puppet/osnailyfacter/modular/virtual_ips/virtual_ips.pp b/deployment/puppet/osnailyfacter/modular/virtual_ips/virtual_ips.pp index 2f9f5b3be8..587623939e 100644 --- a/deployment/puppet/osnailyfacter/modular/virtual_ips/virtual_ips.pp +++ b/deployment/puppet/osnailyfacter/modular/virtual_ips/virtual_ips.pp @@ -4,10 +4,19 @@ $internal_int = hiera('internal_int') $public_int = hiera('public_int', undef) $primary_controller_nodes = hiera('primary_controller_nodes', false) $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) +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 # if $use_neutron { # ip_mgmt_other_nets = join($network_scheme['endpoints']["$internal_int"]['other_nets'], ' ')