Merge pull request 'neoloc/ausyd1nxvm1017' (#55) from neoloc/ausyd1nxvm1017 into develop

Reviewed-on: https://git.query.consul/unkinben/puppet-prod/pulls/55

hieradata/common.yaml

@@ -111,9 +111,15 @@ lookup_options:
   networking::interfaces:
     merge:
       strategy: deep
+  networking::interface_defaults:
+    merge:
+      strategy: deep
   networking::routes:
     merge:
       strategy: deep
+  networking::route_defaults:
+    merge:
+      strategy: deep
   ssh::server::options:
     merge:
       strategy: deep
@@ -282,19 +288,17 @@ sudo::configs:
 profiles::accounts::sysadmin::sshkeys:
   - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDZ8SRLlPiDylBpdWR9LpvPg4fDVD+DZst4yRPFwMMhta4mnB1H9XuvZkptDhXywWQ7QIcqa2WbhCen0OQJCtwn3s7EYtacmF5MxmwBYocPoK2AArGuh6NA9rwTdLrPdzhZ+gwe88PAzRLNzjm0ZBR+mA9saMbPJdqpKp0AWeAM8QofRQAWuCzQg9i0Pn1KDMvVDRHCZof4pVlHSTyHNektq4ifovn0zhKC8jD/cYu95mc5ftBbORexpGiQWwQ3HZw1IBe0ZETB1qPIPwsoJpt3suvMrL6T2//fcIIUE3TcyJKb/yhztja4TZs5jT8370G/vhlT70He0YPxqHub8ZfBv0khlkY93VBWYpNGJwM1fVqlw7XbfBNdOuJivJac8eW317ZdiDnKkBTxapThpPG3et9ib1HoPGKRsd/fICzNz16h2R3tddSdihTFL+bmTCa6Lo+5t5uRuFjQvhSLSgO2/gRAprc3scYOB4pY/lxOFfq3pU2VvSJtRgLNEYMUYKk= ben@unkin.net
 
-networking::interfaces:
+networking::interface_defaults:
-  eth0:
+  ensure: present
-    ensure: present
+  family: inet
-    family: inet
+  method: static
-    method: static
+  netmask: 255.255.255.0
-    netmask: 255.255.255.0
+  onboot: true
-    onboot: true
+networking::route_defaults:
-networking::routes:
+  ensure: present
-  default:
+  interface: eth0
-    ensure: present
+  netmask: 0.0.0.0
-    interface: eth0
+  network: default
-    netmask: 0.0.0.0
-    network: default
 
 profiles::ceph::client::fsid: 7f7f00cb-95de-498c-8dcc-14b54e4e9ca8
 profiles::ceph::client::mons:

hieradata/nodes/ausyd1nxvm1017.main.unkin.net.yaml

@@ -1,8 +1,11 @@
 ---
 profiles::cobbler::params::is_cobbler_master: true
 networking::interfaces:
-  eth0:
+  ens18:
     ipaddress: 198.18.13.27
 networking::routes:
   default:
     gateway: 198.18.13.254
+    interface: ens18
+
+profiles::almalinux::base::remove_ens18: false

modules/networking/manifests/init.pp

@@ -1,20 +1,24 @@
 # unkin networking module
 class networking (
   Hash $interfaces = {},
+  Hash $interface_defaults = {},
   Hash $routes = {},
+  Hash $route_defaults = {},
 ){
 
   include network
   include networking::params
 
   $interfaces.each | $interface, $data | {
+    $merged_data = merge($interface_defaults, $data)
     network_config {$interface:
-      * => $data,
+      * => $merged_data,
     }
   }
   $routes.each | $route, $data | {
+    $merged_data = merge($route_defaults, $data)
     network_route {$route:
-      * => $data,
+      * => $merged_data,
     }
   }
 

site/profiles/manifests/almalinux/base.pp

@@ -1,10 +1,14 @@
 # base almalinux settings
-class profiles::almalinux::base {
+class profiles::almalinux::base (
+  Boolean $remove_ens18 = true,
+) {
 
-  file {'/etc/sysconfig/network-scripts/ifcfg-ens18':
+  if $remove_ens18 {
-    ensure => absent,
+    file {'/etc/sysconfig/network-scripts/ifcfg-ens18':
+      ensure => absent,
+    }
   }
-  -> service {'NetworkManager':
+  service {'NetworkManager':
     ensure  => false,
     enable  => false,
     require => Package['network-scripts'],