From c274c3e5b8f1ffa29c6aa48f671439c5bece2284 Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont (@ardumont)" <ardumont@softwareheritage.org>
Date: Mon, 22 Jan 2024 13:19:13 +0100
Subject: [PATCH] Add rancher abilities to saam
Next step would be to register it to the production cluster.
Refs. swh/infra/sysadm-environment#5214
---
data/hostname/saam.internal.softwareheritage.org.yaml | 3 +++
data/hostname/storage1.internal.staging.swh.network.yaml | 2 +-
site-modules/role/manifests/swh_storage_baremetal.pp | 6 ++++++
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/data/hostname/saam.internal.softwareheritage.org.yaml b/data/hostname/saam.internal.softwareheritage.org.yaml
index c290eb03b..174ea1983 100644
--- a/data/hostname/saam.internal.softwareheritage.org.yaml
+++ b/data/hostname/saam.internal.softwareheritage.org.yaml
@@ -135,3 +135,6 @@ swh::apt_config::backported_packages:
- -systemd-tests
- -udev
- -udev-udeb
+
+# Empty because it got already configured and we want to keep it as-is
+zfs::common::zpool_configuration: {}
diff --git a/data/hostname/storage1.internal.staging.swh.network.yaml b/data/hostname/storage1.internal.staging.swh.network.yaml
index 9d1760617..16dbadc18 100644
--- a/data/hostname/storage1.internal.staging.swh.network.yaml
+++ b/data/hostname/storage1.internal.staging.swh.network.yaml
@@ -52,5 +52,5 @@ swh::apt_config::backported_packages:
- zfsutils-linux
- zfs-zed
-# Empty because it got done manually on it so we want it to not be changed
+# Empty because it got already configured and we want to keep it as-is
zfs::common::zpool_configuration: {}
diff --git a/site-modules/role/manifests/swh_storage_baremetal.pp b/site-modules/role/manifests/swh_storage_baremetal.pp
index 4a3c6967e..036fd4e84 100644
--- a/site-modules/role/manifests/swh_storage_baremetal.pp
+++ b/site-modules/role/manifests/swh_storage_baremetal.pp
@@ -4,4 +4,10 @@ class role::swh_storage_baremetal inherits role::swh_storage {
include profile::mountpoints
include ::profile::swh::deploy::objstorage_cloud
+
+ # (Temporary) Inline the rancher node role's profiles (then make this class inherit
+ # role::rancher_node once the swh rpc services are done being migrated)
+ include profile::zfs::kubelet
+ include profile::zfs::rancher
+ include profile::kubernetes
}
--
GitLab