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>

3 files changed, 6 insertions, 5 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
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
index 55ffcae12..e3d47b03c 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
@@ -51,7 +51,7 @@ parameters:
       address: ${_param:single_address}
       netmask: 255.255.255.0
 
-    salt_control_xenial_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img
+    salt_control_xenial_image: http://apt.mirantis.com/images/ubuntu-16-04-x64-latest.qcow2
     salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
   linux:
     network:
diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system
-Subproject 642199251a72b38d9bce7e505bd778cf4b7dff8
+Subproject 83032c9aa44f1757646787c112412a75fddd2a9