Merge branch 'main' into stable

manifests/dockerhost.pp

@@ -8,6 +8,8 @@ class sunetdrive::dockerhost(
   String $docker_args          = '',
   Optional[String] $docker_dns = undef,
   String $storage_driver       = 'aufs',
+  Boolean $write_daemon_config = false,
+  Boolean $enable_ipv6         = false,
 ) {
   if $version == 'NOT_SET_IN_HIERA' {
     fail('Docker version not set in Hiera')
@@ -26,6 +28,8 @@ class sunetdrive::dockerhost(
     storage_driver            => $storage_driver,
     docker_network            => true,  # let docker choose a network for the 'docker' bridge
     compose_version           => $compose_version,
+    write_daemon_config       => $write_daemon_config,
+    enable_ipv6               => $enable_ipv6,
   }
   file { '/etc/apt/preferences.d/containerd.io.pref':
     ensure => absent,

manifests/scriptreceiver.pp

@@ -48,6 +48,13 @@ class sunetdrive::scriptreceiver()
     owner  => 'root',
     group  => 'root',
   }
+  file { '/usr/local/bin/get_drive_customers':
+    ensure  => file,
+    content => template('sunetdrive/scriptreceiver/get_drive_customers.erb.sh'),
+    mode    => '0744',
+    owner   => 'root',
+    group   => 'root',
+  }
   file { '/usr/local/bin/safer_reboot':
     ensure  => file,
     content => template('sunetdrive/scriptreceiver/safer_reboot.erb'),
@@ -55,6 +62,13 @@ class sunetdrive::scriptreceiver()
     owner   => 'root',
     group   => 'root',
   }
+  file { '/usr/local/bin/get_drive_customers':
+    ensure  => file,
+    content => template('sunetdrive/scriptreceiver/get_drive_customers.erb.sh'),
+    mode    => '0744',
+    owner   => 'root',
+    group   => 'root',
+  }
   file { '/root/.bashrc':
     ensure  => file,
     content => template('sunetdrive/scriptreceiver/baschrc.erb.sh'),

templates/scriptreceiver/get_drive_customers.erb.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+mode=${1}
+if [[ "${mode}" == "multi" ]]; then
+	filter='.multinode_mapping| keys | join("\n")'
+elif [[ "${mode}" == "single" ]]; then
+  filter='.singlenodes| join("\n")'
+else
+	filter='.fullnodes | join("\n")'
+fi
+yq -r "${filter}" < /etc/hiera/data/common.yaml
+