Merge pull request 'fix: enable repos before installing packages' (#162) from neoloc/repofirst into develop

Reviewed-on: unkinben/puppet-prod#162
This commit is contained in:
2024-04-22 18:51:26 +09:30
2 changed files with 23 additions and 14 deletions
+7 -14
View File
@@ -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']
}
+16
View File
@@ -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']}")
}
}
}