Giuseppe Lavagetto has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/404305 )
Change subject: profile::base: run the apt configuration before anything else
......................................................................
profile::base: run the apt configuration before anything else
To this end, introduce a stage => 'apt-config', that's supposed to
include only the apt class.
Change-Id: I21bf60687864e1a796c72fb293b99350bc09c64f
---
M manifests/realm.pp
M modules/profile/manifests/base.pp
2 files changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/05/404305/1
diff --git a/manifests/realm.pp b/manifests/realm.pp
index 1652589..5c6425b 100644
--- a/manifests/realm.pp
+++ b/manifests/realm.pp
@@ -22,6 +22,11 @@
$realm = hiera('realm', 'production')
}
+stage { 'apt-config':
+ before => Stage['main']
+}
+
+
if $realm == 'labs' {
# Pull the project name from the certname.
# Labs certs are <hostname>.<projname>.<site>.wmflabs
diff --git a/modules/profile/manifests/base.pp
b/modules/profile/manifests/base.pp
index fbdaa84..51b4ff5 100644
--- a/modules/profile/manifests/base.pp
+++ b/modules/profile/manifests/base.pp
@@ -25,9 +25,12 @@
$overlayfs = hiera('profile::base::overlayfs', false),
) {
require ::profile::base::certificates
+
+ # Apt configuration needs to happen before anything else happens.
class { '::apt':
use_proxy => $use_apt_proxy,
purge_sources => $purge_apt_sources,
+ stage => 'apt-config'
}
file { ['/usr/local/sbin', '/usr/local/share/bash']:
--
To view, visit https://gerrit.wikimedia.org/r/404305
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I21bf60687864e1a796c72fb293b99350bc09c64f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
