Check private address when VxLAN is used

Closes-Bug: #1518377
Change-Id: I2447fc8a02b8fe826fa154e0e44c2edc8981e18c
This commit is contained in:
Simon Pasquier 2015-11-20 17:24:54 +01:00
parent 753c134601
commit 611dea8c4c

View File

@ -77,13 +77,12 @@ if $lma_collector['node_cluster_alarms'] {
$node_cluster_alarms = []
}
# The private network exists only when the GRE segmentation is used
# FIXME(pasquier-s): should check for VxLAN too
$network_config = hiera('quantum_settings')
$segmentation_type = $network_config['L2']['segmentation_type']
if $segmentation_type == 'gre' {
$private_network = true
} else {
# The private network exists only with Neutron overlay networks
if hiera('use_neutron', false) {
$neutron_config = hiera('quantum_settings')
$private_network = ($neutron_config['L2']['segmentation_type'] != 'vlan')
}
else {
$private_network = false
}