summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorrandyl <r.levensalor@cablelabs.com>2015-09-14 18:11:23 -0600
committerTim Rozet <trozet@redhat.com>2015-09-18 14:09:29 +0000
commit27369695b4503ae4f3b17c7b0785d2490bd83298 (patch)
tree9edcf95634a40cab6f7e94d86ecfb822ca317849 /common
parentc7dbe0fad10db9fe178ce18bbe501f8e678285a2 (diff)
Corrects the default route on controllers
BGS-84 After the changes to br-ex on the control nodes. The default route was no longer correct on the control nodes in bare metal deployments. Added an admin_network paramater for barmetal deployments. Added logic on br-ex in to set DEROUTE=no on the admin network in the extern_net_presetup. Tested on HA physical deployment. Change-Id: Ic4b1ef521da2c55590990411f3f2444d4c94b019 Signed-off-by: randyl <r.levensalor@cablelabs.com> (cherry picked from commit 7dc718a545c2da1b7bf150bf652705aeb98b245c)
Diffstat (limited to 'common')
-rw-r--r--common/puppet-opnfv/manifests/external_net_presetup.pp13
1 files changed, 12 insertions, 1 deletions
diff --git a/common/puppet-opnfv/manifests/external_net_presetup.pp b/common/puppet-opnfv/manifests/external_net_presetup.pp
index 96038c0..f52b903 100644
--- a/common/puppet-opnfv/manifests/external_net_presetup.pp
+++ b/common/puppet-opnfv/manifests/external_net_presetup.pp
@@ -24,13 +24,24 @@ class opnfv::external_net_presetup {
$controllers_hostnames_array_str = $controllers_hostnames_array
$controllers_hostnames_array = split($controllers_hostnames_array, ',')
+ if ($admin_network != '') and ($admin_network != 'false') {
+ $admin_nic = get_nic_from_network("$admin_network")
+ if $admin_nic == '' { fail('admin_nic was not found') }
+ #Disable defalute route on Admin network
+ file_line { 'disable-defroute-admin':
+ path => "/etc/sysconfig/network-scripts/ifcfg-$admin_nic",
+ line => 'DEFROUTE=no',
+ match => '^DEFROUTE',
+ }
+ }
+
#find public NIC
$public_nic = get_nic_from_network("$public_network")
$public_nic_ip = get_ip_from_nic("$public_nic")
$public_nic_netmask = get_netmask_from_nic("$public_nic")
if ($public_nic == '') or ($public_nic_ip == '') or ($public_nic == "br-ex") or ($public_nic == "br_ex") {
- notify {"Skipping augeas, public_nic ${public_nic}, public_nic_ip ${public_nic_ip}":}
+ notify {"Skipping augeas, public_nic ${public_nic}, public_nic_ip ${public_nic_ip}":}
exec {'ovs-vsctl -t 10 -- --may-exist add-br br-ex':
path => ["/usr/sbin/", "/usr/bin/"],