source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh"
# KVM, compute node prereqs (libvirt first), VCP deployment
+salt -C 'kvm* or cmp*' file.line \
+ /usr/lib/python2.7/dist-packages/salt/modules/debian_ip.py \
+ content='iface = iface.lower()' mode='delete'
salt -C 'kvm*' pkg.install bridge-utils
salt -C 'kvm*' state.apply linux.network
-salt -C 'kvm*' system.reboot
-wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | grep -Fq 'Not connected'"
+salt -C 'cmp*' state.apply linux.system
+salt -C 'cmp*' state.apply linux.network || true
+salt -C 'kvm* or cmp*' system.reboot
+wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \
+ "tee /dev/stderr | grep -Fq 'Not connected'"
salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp
# Check all vcp nodes are available
rc=1
-while [ $rc -ne 0 ]; do
+attempt=0
+total_attempts=50
+while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do
rc=0
for node in $vcp_nodes; do
salt "$node" test.ping 2>/dev/null || { rc=$?; break; };
done
sleep 5
+ ((attempt+=1))
done
wait_for 10 "salt -C '* and not cfg01* and not mas01*' saltutil.sync_all"