X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mcp%2Fconfig%2Fstates%2Fbaremetal_init;h=891eae3656e030ac9f3beb172416b10e4c4d3b19;hb=f15d0275832e59c4e2ac16fa9c066b5771b26dfb;hp=ef2f78b7055067ff389406f32dd893aa37fa83c0;hpb=3f559299c232bbb7639d02243c95d6256cdf94d4;p=fuel.git

diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init
index ef2f78b70..891eae365 100755
--- a/mcp/config/states/baremetal_init
+++ b/mcp/config/states/baremetal_init
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 ##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
 # which accompanies this distribution, and is available at
@@ -23,11 +23,18 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \
   repl="\n        if not __salt__['pkg.version']('vlan'):\n            __salt__['pkg.install']('vlan')"
 
 salt -C 'kvm*' pkg.install bridge-utils
-salt -C 'kvm*' state.apply linux.network
+salt -C 'kvm*' state.apply linux.network,linux.system.kernel
 salt -C 'kvm* or cmp*' state.apply salt.minion
-salt -C 'kvm* or cmp*' service.force_reload salt-minion
-salt -C 'cmp*' state.apply linux.system
+wait_for 5.0 "salt -C 'cmp*' state.apply linux.system"
+# wrap distro `route` binary to silence errors when route already exists
+wait_for 5.0 "salt -C 'kvm* or cmp*' state.apply opnfv.route_wrapper"
 salt -C 'cmp*' state.apply linux.network || true
+wait_for 30.0 "salt -C 'kvm* or cmp*' test.ping"
+
+# disable dhcp offered routes on compute nodes
+salt -C 'cmp*' file.write /etc/dhcp/dhclient-enter-hooks.d/no-default-route \
+  args='unset new_routers'
+
 salt -C 'kvm* or cmp*' system.reboot
 wait_for 90.0 "salt -C 'kvm* or cmp*' test.ping"