Andrew Bogott has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/397821 )
Change subject: labs-bootstrapvz-jessie: include puppet pinning in base images
......................................................................
labs-bootstrapvz-jessie: include puppet pinning in base images
Bug: T178717
Change-Id: Ifabc0b10ed0c42d5678a3e2ee16f30a6f20f34e2
---
M modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml
M modules/labs_bootstrapvz/files/labs-stretch.manifest.yaml
2 files changed, 6 insertions(+), 0 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml
b/modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml
index 9ade0a9..ee72362 100644
--- a/modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml
+++ b/modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml
@@ -178,6 +178,9 @@
src: /etc/apt/preferences.d/wikimedia.pref
dst: /etc/apt/preferences.d/wikimedia.pref
-
+ src: /etc/apt/preferences.d/puppet_all.pref
+ dst: /etc/apt/preferences.d/puppet_all.pref
+ -
src: /etc/ssl/certs/ca-certificates.crt
dst: /etc/ssl/certs/ca-certificates.crt
commands:
diff --git a/modules/labs_bootstrapvz/files/labs-stretch.manifest.yaml
b/modules/labs_bootstrapvz/files/labs-stretch.manifest.yaml
index 8de5c21..40de856 100644
--- a/modules/labs_bootstrapvz/files/labs-stretch.manifest.yaml
+++ b/modules/labs_bootstrapvz/files/labs-stretch.manifest.yaml
@@ -173,6 +173,9 @@
src: /etc/apt/preferences.d/wikimedia.pref
dst: /etc/apt/preferences.d/wikimedia.pref
-
+ src: /etc/apt/preferences.d/puppet_all.pref
+ dst: /etc/apt/preferences.d/puppet_all.pref
+ -
src: /etc/ssl/certs/ca-certificates.crt
dst: /etc/ssl/certs/ca-certificates.crt
--
To view, visit https://gerrit.wikimedia.org/r/397821
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifabc0b10ed0c42d5678a3e2ee16f30a6f20f34e2
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
