X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=common%2Fpuppet-opnfv%2Fmanifests%2Fexternal_net_presetup.pp;h=85073c36fd7d84151aa090579ff4bce9739e33d1;hb=d4eb37b317137772d783a12be0ff06504669ad63;hp=f52b9038988b5b5a9e65818e7d1c5c9aea5bf272;hpb=27369695b4503ae4f3b17c7b0785d2490bd83298;p=genesis.git

diff --git a/common/puppet-opnfv/manifests/external_net_presetup.pp b/common/puppet-opnfv/manifests/external_net_presetup.pp
index f52b903..85073c3 100644
--- a/common/puppet-opnfv/manifests/external_net_presetup.pp
+++ b/common/puppet-opnfv/manifests/external_net_presetup.pp
@@ -27,12 +27,68 @@ class opnfv::external_net_presetup {
   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',
+    $admin_ip = get_ip_from_nic("$admin_nic")
+    $admin_netmask = get_netmask_from_nic("$admin_nic")
+    if !$admin_ip { fail("admin_ip was not found $admin_nic") }
+    if !$admin_netmask { fail("admin_netmask was not found on $admin_nic") }
+
+    #Modify ifcfg Admin network
+    augeas { "main-$admin_nic":
+        context => "/files/etc/sysconfig/network-scripts/ifcfg-$admin_nic",
+        changes => [
+                "set IPADDR $admin_ip",
+                "set NETMASK $admin_netmask",
+                "rm GATEWAY",
+                "rm DNS1",
+                "set DEFROUTE no",
+                "rm IPV6_DEFROUTE",
+                "rm IPV6_PEERDNS",
+                "rm IPV6_PEERROUTES",
+                "rm PEERROUTES",
+                "set PEERDNS no",
+                "set BOOTPROTO static",
+                "set IPV6INIT no",
+                "set IPV6_AUTOCONF no",
+                "set ONBOOT yes",
+
+        ],
+        notify  => Exec['systemctl restart network'],
     }
+
+  }
+
+  if ($private_network != '') and ($private_network != 'false') {
+    $private_nic = get_nic_from_network("$private_network")
+    if $private_nic == '' { fail('private_nic was not found') }
+    notify {"Private nic $private_nic":}
+    $private_ip = get_ip_from_nic("$private_nic")
+    $private_netmask = get_netmask_from_nic("$private_nic")
+    if !$private_ip { fail("private_ip was not found on $private_nic") }
+    if !$private_netmask { fail("private_netmask was not found on $private_nic") }
+
+    #Modify ifcfg private network
+    augeas { "main-$private_nic":
+        context => "/files/etc/sysconfig/network-scripts/ifcfg-$private_nic",
+        changes => [
+                "set IPADDR $private_ip",
+                "set NETMASK $private_netmask",
+                "rm GATEWAY",
+                "rm DNS1",
+                "set DEFROUTE no",
+                "rm IPV6_DEFROUTE",
+                "rm IPV6_PEERDNS",
+                "rm IPV6_PEERROUTES",
+                "rm PEERROUTES",
+                "set PEERDNS no",
+                "set BOOTPROTO static",
+                "set IPV6INIT no",
+                "set IPV6_AUTOCONF no",
+                "set ONBOOT yes",
+
+        ],
+        notify  => Exec['systemctl restart network'],
+    }
+
   }
 
   #find public NIC