From 140c251162d6e5609d4b193ff26a01a0851753e1 Mon Sep 17 00:00:00 2001 From: Sergey Vasilenko Date: Thu, 19 Nov 2015 14:59:38 +0300 Subject: [PATCH] Prevent to use physnet definition while creating 'local' networks This is a intermediate solution on the way to dynamic physnets and networks creation. Change-Id: I53cf1c67b82ef8b14f2e1d69f22985ca6a69c0e6 Closes-bug: #1517853 blueprint: dyn-gen-physnet-set --- .../osnailyfacter/modular/openstack-network/networks.pp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/deployment/puppet/osnailyfacter/modular/openstack-network/networks.pp b/deployment/puppet/osnailyfacter/modular/openstack-network/networks.pp index a61d775be1..eaabd98772 100644 --- a/deployment/puppet/osnailyfacter/modular/openstack-network/networks.pp +++ b/deployment/puppet/osnailyfacter/modular/openstack-network/networks.pp @@ -26,7 +26,11 @@ if hiera('use_neutron', false) { $private_net_physnet = try_get_value($nets, "${private_net}/L2/physnet", false) $private_net_shared = try_get_value($nets, "${private_net}/shared", false) $private_net_router_external = false - $floating_net_physnet = try_get_value($nets, "${floating_net}/L2/physnet", false) + $floating_net_type = try_get_value($nets, "${floating_net}/L2/network_type", 'local') + $floating_net_physnet = $floating_net_type ? { + 'local' => false, + default => try_get_value($nets, "${floating_net}/L2/physnet", false), + } $floating_net_router_external = try_get_value($nets, "${floating_net}/L2/router_ext") $floating_net_floating_range = try_get_value($nets, "${floating_net}/L3/floating", '') $floating_net_shared = try_get_value($nets, "${floating_net}/shared", false) @@ -40,7 +44,7 @@ if hiera('use_neutron', false) { neutron_network { $floating_net : ensure => 'present', provider_physical_network => $floating_net_physnet, - provider_network_type => 'local', + provider_network_type => $floating_net_type, router_external => $floating_net_router_external, tenant_name => $tenant_name, shared => $floating_net_shared