From d8059095ab25e5939373777330b955075d064ec6 Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Thu, 15 Sep 2016 14:36:24 -0400 Subject: Removing --flat and network_isolation variables VLAN support allows a set of nodes with a single nic to deploy removing the need for --flat. flat was not well maintained or tested. Change-Id: Ieae1c2350c83544ce50048b44300fa0b8e68dd43 Signed-off-by: Dan Radez --- lib/configure-deps-functions.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'lib/configure-deps-functions.sh') diff --git a/lib/configure-deps-functions.sh b/lib/configure-deps-functions.sh index 11bba446..1d238f87 100755 --- a/lib/configure-deps-functions.sh +++ b/lib/configure-deps-functions.sh @@ -33,12 +33,8 @@ function configure_deps { systemctl status libvirtd || systemctl start libvirtd systemctl status openvswitch || systemctl start openvswitch - # If flat we only use admin network - if [[ "$net_isolation_enabled" == "FALSE" ]]; then - virsh_enabled_networks="admin" - enabled_network_list="admin" # For baremetal we only need to create/attach Undercloud to admin and external - elif [ "$virtual" == "FALSE" ]; then + if [ "$virtual" == "FALSE" ]; then virsh_enabled_networks="admin external" else virsh_enabled_networks=$enabled_network_list -- cgit 1.2.3-korg