salt -C 'mas01*' state.apply maas.machines
# TODO: relax cond, as this is not re-entrant (e.g. nodes already deployed)
wait_for "salt 'mas01*' --out yaml state.apply maas.machines.status | " \
- "fgrep -q 'Ready: 5'"
+ "tee /dev/stderr | fgrep -q 'Ready: 5'"
+
+# cleanup outdated salt keys
+salt-key --out yaml | awk '!/^(minions|- cfg01|- mas01)/ {print $2}' | xargs -I{} salt-key -yd {}
# MaaS node deployment
salt -C 'mas01*' state.apply maas.machines.deploy
wait_for "salt 'mas01*' --out yaml state.apply maas.machines.status | " \
- "fgrep -q 'Deployed: 5'"
+ "tee /dev/stderr | fgrep -q 'Deployed: 5'"
salt -C 'mas01*' pillar.item\
maas:region:admin:username \
salt -C 'kvm*' pkg.install bridge-utils
salt -C 'kvm*' state.apply linux.network
salt -C 'kvm*' system.reboot
-wait_for "! salt '*' test.ping | fgrep -q 'Not connected'"
+wait_for "! salt '*' test.ping | tee /dev/stderr | fgrep -q 'Not connected'"
salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp
salt -C '* and not cfg01* and not mas01*' state.apply salt
salt -C 'kvm*' state.sls salt.control
+vcp_nodes=$(salt --out yaml 'kvm01*' pillar.get salt:control:cluster:internal:node | awk '/\s+\w+:$/ {gsub(/:$/, "*"); print $1}')
+
+# Check all vcp nodes are available
+rc=1
+while [ $rc -ne 0 ]; do
+ rc=0
+ for node in $vcp_nodes; do
+ salt "$node" test.ping 2>/dev/null 1>&2 || { rc=$?; break; };
+ done
+done
+
salt -C '* and not cfg01* and not mas01*' saltutil.sync_all
salt -C '* and not cfg01* and not mas01*' state.apply salt
-salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp
+wait_for "salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp"