commit be962ed52507e7fd391beede2a39bac3089ba8b1
author Richard Felkl <rfelkl@mirantis.com> Thu Jun 14 17:28:08 2018 +0200
committer Richard Felkl <rfelkl@mirantis.com> Fri Jun 15 14:03:04 2018 +0200
tree a4bdbafbd292c340590e348bf96e635bc2b697c3
parent 1b2ccb2c8eb99c5e81dd7e94abe98a0a4c3d226d

Enable CTL interface for cfg01 by default.

Change-Id: I1179ff6e1d9b3fcaa2efe3e0fd8bcf1e20840fcb
Related: PROD-20517

predefine-vm/define-vm.sh

diff --git a/predefine-vm/define-vm.sh b/predefine-vm/define-vm.sh
index 6a4f1fe..7914c94 100755
--- a/predefine-vm/define-vm.sh
+++ b/predefine-vm/define-vm.sh
@@ -1,6 +1,7 @@
 #!/bin/bash -xe
 
 VM_MGM_BRIDGE_NAME=${VM_MGM_BRIDGE_NAME:-"br-mgm"}
+VM_CTL_BRIDGE_NAME=${VM_CTL_BRIDGE_NAME:-"br-ctl"}
 VM_MEM_KB=${VM_MEM_KB:-"8388608"}
 VM_CPUS=${VM_CPUS:-"4"}
 
@@ -65,8 +66,7 @@
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </interface>
 EOF
-if [[ -n ${VM_CTL_BRIDGE_NAME} ]]; then
-echo "\$VM_CTL_BRIDGE_NAME detected, adding one more nic to VM"
+if [[ ! ${VM_CTL_BRIDGE_DISABLE} ]]; then
 cat <<EOF >> $(pwd)/${VM_NAME}-vm.xml
     <interface type='bridge'>
       <source bridge='$VM_CTL_BRIDGE_NAME'/>