LOAD_BALANCER: Move defines to separate namespaced files

SUNET · Oct 24, 2023 · c418076 · c418076
1 parent 0aed680
commit c418076
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 47 deletions.
diff --git a/manifests/frontend/load_balancer.pp b/manifests/frontend/load_balancer.pp
@@ -45,9 +45,9 @@
         notify  => Sunet::Exabgp['load_balancer'],
       }
 
-      configure_peers { 'peers': router_id => $router_id, peers => $config['load_balancer']['peers'] }
+      sunet::frontend::load_balancer::configure_peers { 'peers': router_id => $router_id, peers => $config['load_balancer']['peers'] }
 
-      configure_websites2 { 'websites':
+      sunet::frontend::load_balancer::configure_websites2 { 'websites':
         websites  => $config['load_balancer']['websites2'],
         basedir   => $basedir,
         confdir   => $confdir,
@@ -101,48 +101,3 @@
   }
 }
 
-define sysctl_ip_nonlocal_bind() {
-  # Allow haproxy to bind() to a service IP address even if it haven't actually
-  # been set up on an interface yet
-  augeas { 'frontend_ip_nonlocal_bind_config':
-    context => '/files/etc/sysctl.d/10-sunet-frontend-ip-non-local-bind.conf',
-    changes => [
-                'set net.ipv4.ip_nonlocal_bind 1',
-                'set net.ipv6.ip_nonlocal_bind 1',
-                ],
-    notify  => Exec['reload_sysctl_10-sunet-frontend-ip-non-local-bind.conf'],
-  }
-
-  exec { 'reload_sysctl_10-sunet-frontend-ip-non-local-bind.conf':
-    command     => '/sbin/sysctl -p /etc/sysctl.d/10-sunet-frontend-ip-non-local-bind.conf',
-    refreshonly => true,
-  }
-}
-
-define configure_peers($router_id, $peers)
-{
-  $defaults = {
-    router_id => $router_id,
-  }
-  create_resources('sunet::frontend::load_balancer::peer', $peers, $defaults)
-}
-
-define configure_websites($websites, $basedir, $confdir)
-{
-  create_resources('sunet::frontend::load_balancer::website', $websites, {
-    'basedir' => $basedir,
-    'confdir' => $confdir,
-    })
-}
-
-define configure_websites2($websites, $basedir, $confdir, $scriptdir)
-{
-  each($websites) | $site, $config | {
-    create_resources('sunet::frontend::load_balancer::website2', {$site => {}}, {
-      'basedir'         => $basedir,
-      'confdir'         => $confdir,
-      'scriptdir'       => $scriptdir,
-      'config'          => $config,
-      })
-  }
-}
diff --git a/manifests/frontend/load_balancer/configure_peers.pp b/manifests/frontend/load_balancer/configure_peers.pp
@@ -0,0 +1,8 @@
+define sunet::frontend::load_balancer::configure_peers($router_id, $peers)
+{
+  $defaults = {
+    router_id => $router_id,
+  }
+  create_resources('sunet::frontend::load_balancer::peer', $peers, $defaults)
+}
+
diff --git a/manifests/frontend/load_balancer/configure_websites.pp b/manifests/frontend/load_balancer/configure_websites.pp
@@ -0,0 +1,9 @@
+
+define sunet::frontend::load_balancer::configure_websites($websites, $basedir, $confdir)
+{
+  create_resources('sunet::frontend::load_balancer::website', $websites, {
+    'basedir' => $basedir,
+    'confdir' => $confdir,
+    })
+}
+
diff --git a/manifests/frontend/load_balancer/configure_websites2.pp b/manifests/frontend/load_balancer/configure_websites2.pp
@@ -0,0 +1,12 @@
+
+define sunet::frontend::load_balancer::configure_websites2($websites, $basedir, $confdir, $scriptdir)
+{
+  each($websites) | $site, $config | {
+    create_resources('sunet::frontend::load_balancer::website2', {$site => {}}, {
+      'basedir'         => $basedir,
+      'confdir'         => $confdir,
+      'scriptdir'       => $scriptdir,
+      'config'          => $config,
+      })
+  }
+}
diff --git a/manifests/frontend/load_balancer/sysctl_ip_nonlocal_bind.pp b/manifests/frontend/load_balancer/sysctl_ip_nonlocal_bind.pp
@@ -0,0 +1,18 @@
+
+define sunet::frontend::load_balancer::sysctl_ip_nonlocal_bind() {
+  # Allow haproxy to bind() to a service IP address even if it haven't actually
+  # been set up on an interface yet
+  augeas { 'frontend_ip_nonlocal_bind_config':
+    context => '/files/etc/sysctl.d/10-sunet-frontend-ip-non-local-bind.conf',
+    changes => [
+                'set net.ipv4.ip_nonlocal_bind 1',
+                'set net.ipv6.ip_nonlocal_bind 1',
+                ],
+    notify  => Exec['reload_sysctl_10-sunet-frontend-ip-non-local-bind.conf'],
+  }
+
+  exec { 'reload_sysctl_10-sunet-frontend-ip-non-local-bind.conf':
+    command     => '/sbin/sysctl -p /etc/sysctl.d/10-sunet-frontend-ip-non-local-bind.conf',
+    refreshonly => true,
+  }
+}