diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-22 14:57:52 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-11-22 14:57:52 +0000 |
| commit | 9b5bffe65199af34cb089c7a782e5e4234610768 (patch) | |
| tree | b148ae9f64d5ade64d7d33e7575a34f9345f1ac6 /mcp/config/states | |
| parent | 322884cd6007db93ef69ac0faeaefec9f32c010c (diff) | |
| parent | 33e1d84ffb71e283acc0b3f834066a0bc5837780 (diff) | |
Merge "[baremetal] public gateway setup on prx nodes" into stable/euphrates
Diffstat (limited to 'mcp/config/states')
| -rwxr-xr-x | mcp/config/states/virtual_control_plane | 5 |
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' |