From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Tue, 28 Nov 2017 18:53:50 +0000 (+0100)
Subject: [baremetal] Fix prx stale route via MaaS DHCP
X-Git-Tag: opnfv-5.1.RC1~18
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F15%2F48015%2F1;p=fuel.git

[baremetal] Fix prx stale route via MaaS DHCP

Although we add default routes via public network and disable
DHCP client from setting new routes, until we reboot the prx* nodes
we still have the stale route originally set at initial boot.

Change-Id: Ib8e5fb67c7da00684e0ac21984fc4661d3820d83
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 7daf7f128714021711970557129a23a86cce2a72)
---

diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
index c355126f7..b08a31ce6 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
@@ -80,3 +80,6 @@ wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' ssh.set_auth_key ${SUDO_US
 # Disable proxy dhcp routes after installation
 salt -C 'prx*' file.write /etc/dhcp/dhclient-enter-hooks.d/no-default-route \
   args='unset new_routers'
+salt -C 'prx*' system.reboot
+wait_for 30 "! salt -C 'prx*' test.ping | " \
+  "tee /dev/stderr | grep -Fq 'Not connected'"