From df56213b188c2a3107987fc79f522d6f31b8a2a1 Mon Sep 17 00:00:00 2001
From: Ben Vincent <ben@unkin.net>
Date: Mon, 22 Apr 2024 18:51:20 +1000
Subject: [PATCH] fix: enable repos before installing packages

---
 site/profiles/manifests/base.pp       | 21 +++++++--------------
 site/profiles/manifests/base/repos.pp | 16 ++++++++++++++++
 2 files changed, 23 insertions(+), 14 deletions(-)
 create mode 100644 site/profiles/manifests/base/repos.pp

diff --git a/site/profiles/manifests/base.pp b/site/profiles/manifests/base.pp
index fb463d6..5d30011 100644
--- a/site/profiles/manifests/base.pp
+++ b/site/profiles/manifests/base.pp
@@ -6,20 +6,6 @@ class profiles::base (
   # install the vault ca first
   include profiles::pki::vaultca
 
-  # manage package repositories
-  case $facts['os']['family'] {
-    'RedHat': {
-      include profiles::yum::global
-      include profiles::firewall::firewalld
-    }
-    'Debian': {
-      include profiles::apt::global
-    }
-    default: {
-      fail("Unsupported OS family ${facts['os']['family']}")
-    }
-  }
-
   # manage the puppet agent
   include profiles::puppet::agent
 
@@ -29,6 +15,7 @@ class profiles::base (
   }
 
   # include the base profiles
+  include profiles::base::repos
   include profiles::packages
   include profiles::base::facts
   include profiles::base::motd
@@ -63,4 +50,10 @@ class profiles::base (
 
   # include classes from hiera
   lookup('hiera_classes', Array[String], 'unique').include
+
+  # specifc ordering constraints
+  Class['profiles::pki::vaultca']
+  -> Class['profiles::base::repos']
+  -> Class['profiles::packages']
+
 }
diff --git a/site/profiles/manifests/base/repos.pp b/site/profiles/manifests/base/repos.pp
new file mode 100644
index 0000000..8d3223f
--- /dev/null
+++ b/site/profiles/manifests/base/repos.pp
@@ -0,0 +1,16 @@
+# profiles::base::repos
+class profiles::base::repos {
+  # manage package repositories
+  case $facts['os']['family'] {
+    'RedHat': {
+      include profiles::yum::global
+      include profiles::firewall::firewalld
+    }
+    'Debian': {
+      include profiles::apt::global
+    }
+    default: {
+      fail("Unsupported OS family ${facts['os']['family']}")
+    }
+  }
+}