Updates docs for D2.0

[apex.git] / lib / configure-deps-functions.sh

diff --git a/lib/configure-deps-functions.sh b/lib/configure-deps-functions.sh
index 11bba44..3c82c66 100755 (executable)
--- 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
@@ -55,7 +51,7 @@ function configure_deps {
       echo "${blue}INFO: Creating Virsh Network: $network & OVS Bridge: ${NET_MAP[$network]}${reset}"
       ovs-vsctl list-br | grep "^${NET_MAP[$network]}$" > /dev/null || ovs-vsctl add-br ${NET_MAP[$network]}
       virsh net-list --all | grep " $network " > /dev/null || (cat > ${libvirt_dir}/apex-virsh-net.xml && virsh net-define ${libvirt_dir}/apex-virsh-net.xml) << EOF
-<network>
+<network ipv6='yes'>
   <name>$network</name>
   <forward mode='bridge'/>
   <bridge name='${NET_MAP[$network]}'/>
@@ -79,7 +75,7 @@ EOF
       if [[ "$network" != "admin" && "$network" != "external" ]]; then
         continue
       fi
-      this_interface=$(eval echo \${${network}_bridged_interface})
+      this_interface=$(eval echo \${${network}_installer_vm_members})
       # check if this a bridged interface for this network
       if [[ ! -z "$this_interface" || "$this_interface" != "none" ]]; then
         if ! attach_interface_to_ovs ${NET_MAP[$network]} ${this_interface} ${network}; then