Apply network config on kvm nodes

* re-assign ip from interface to bridge
  - install bridge utils
  - make a reboot straight away after network config
* change image source for vcp

Change-Id: I34506ee161337b5d3a4088cfdf3c082d99ccb695
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>

1 files changed, 5 insertions, 4 deletions

diff --git a/mcp/config/states/maas b/mcp/config/states/maas
index 8b599105d..7b3bb6433 100755
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
@@ -40,15 +40,16 @@ salt -C 'mas01*' pillar.item\
 
 # KVM, compute node prereqs (libvirt first), VCP deployment
 salt -C '* and not cfg01* and not mas01*' saltutil.sync_all
+
+salt 'kvm*' pkg.install bridge-utils
+salt 'kvm*' cmd.run 'salt-call state.sls linux.network; reboot'
+wait_for "! salt '*' test.ping | fgrep -q 'Not connected'"
+
 salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp
 
 salt -C 'kvm*' state.sls libvirt
 
-salt -C '* and not cfg01* and not mas01*' system.reboot
-wait_for "! salt '*' test.ping | fgrep -q 'Not connected'"
-
 salt -C '* and not cfg01* and not mas01*' state.apply salt
-
 salt -C 'kvm*' state.sls salt.control
 
 salt -C '* and not cfg01* and not mas01*' saltutil.sync_all