diff options
| author |   Jonas Bjurel <jonas.bjurel@ericsson.com> | 2015-10-03 17:34:24 +0200 |
|---|---|---|
| committer | Jonas Bjurel <jonas.bjurel@ericsson.com> | 2015-10-03 17:34:24 +0200 |
| commit | 543130927ba40a174e8674cca66ae442d5056d76 (patch) | |
| tree | ee497cf48d8f31e998b48c6ae54fc625b852b20d /common/puppet-opnfv/manifests/external_net_presetup.pp | |
| parent | 11dbe27afb96c5b54b9f4f0a1c8b21194f59dc7b (diff) | |
Moving tag arno.2015.2.0 from genesis to fuel/stable/arnoarno.2015.2.0stable/arno
Change-Id: I01b5f9f9125756d80d7ca666bb6d994f2b13d2a0
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
Diffstat (limited to 'common/puppet-opnfv/manifests/external_net_presetup.pp')
| -rw-r--r-- | common/puppet-opnfv/manifests/external_net_presetup.pp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/common/puppet-opnfv/manifests/external_net_presetup.pp b/common/puppet-opnfv/manifests/external_net_presetup.pp index b7c7c5f07..f52b90389 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/"], @@ -85,7 +96,7 @@ class opnfv::external_net_presetup { owner => 'root', group => 'root', mode => '0644', - content => template('trystack/br_ex.erb'), + content => template('opnfv/br_ex.erb'), before => Class["quickstack::pacemaker::params"], } -> |