diff options
| author |   Guillermo Herrero <guillermo.herrero@enea.com> | 2017-11-16 14:05:42 +0100 |
|---|---|---|
| committer |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-21 15:46:29 +0000 |
| commit | 33e1d84ffb71e283acc0b3f834066a0bc5837780 (patch) | |
| tree | e733f7f52799204c6db841bba010cf8e245c042b /mcp/config/states | |
| parent | ee21bd791dd74558254f2b4aaef15504c9d395ea (diff) | |
[baremetal] public gateway setup on prx nodes
- prx: add route for public traffic to public interface
- prx: add route towards salt master through maas
- remove dashboard class from proxy node (already implements horizon)
- remove dashboard (and benchmark) class definitions (no longer used)
- (temporary) backport Pharos change for adapter template
JIRA: FUEL-305
Change-Id: Ia14a18ac0123c1134d8d99dc43da9a1f770001d0
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
(cherry picked from commit 07f4e0238646fcb77072769feb8a0b68df52caca)
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' |