diff options
| author |   Tim Rozet <trozet@redhat.com> | 2015-09-17 22:23:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-09-17 22:23:29 +0000 |
| commit | f04b553aedbd2c7d72e392ac8f2e4b6d033bb53e (patch) | |
| tree | c87aea74729b5b0cd87fc2bbb236024dad60f815 /common | |
| parent | 67bcb6b3596fe99a7ec59aa66593c218c6241355 (diff) | |
| parent | 7dc718a545c2da1b7bf150bf652705aeb98b245c (diff) | |
Merge "Corrects the default route on controllers"
Diffstat (limited to 'common')
| -rw-r--r-- | common/puppet-opnfv/manifests/external_net_presetup.pp | 13 |
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/"], |