summaryrefslogtreecommitdiffstats
path: root/mcp/config/states
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-11-21 08:04:04 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-11-21 08:04:04 +0000
commit77609e7fcebc76f4e10a133354787ad5086c0450 (patch)
tree6699159e0491deea575d1a73163930f1f20a0633 /mcp/config/states
parentd7927a5e63e5314c2a81970150b849b0b9d0bd49 (diff)
parent07f4e0238646fcb77072769feb8a0b68df52caca (diff)
Merge "[baremetal] public gateway setup on prx nodes"
Diffstat (limited to 'mcp/config/states')
-rwxr-xr-xmcp/config/states/virtual_control_plane5
1 files changed, 4 insertions, 1 deletions
diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
index b9db08a1a..cfd5e421c 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
@@ -12,7 +12,6 @@ CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x
# shellcheck disable=SC1090
source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh"
-# KVM, compute node prereqs (libvirt first), VCP deployment
# patch the networking module for Debian based distros
debian_ip_source=/usr/lib/python2.7/dist-packages/salt/modules/debian_ip.py
salt -C 'kvm* or cmp*' file.line $debian_ip_source \
@@ -62,3 +61,7 @@ wait_for 10 "! salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply linux,ntp |
wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' ssh.set_auth_key ${SUDO_USER} \
$(awk 'NR==1{print $2}' "$(eval echo "~${SUDO_USER}/.ssh/authorized_keys")")"
+
+# Disable proxy dhcp routes after installation
+salt -C 'prx*' file.write /etc/dhcp/dhclient-enter-hooks.d/no-default-route \
+ args='unset new_routers'