BryanDavis has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/403076 )
Change subject: puppet: pin to version 3.*
......................................................................
puppet: pin to version 3.*
Prevent `apt-get update && apt-get upgrade` from picking Puppet4 as the
version to install by pinning to Puppet 3.x with apt.
Bug: T184038
Change-Id: I309b193596735d409978132e6784f4ad703151d3
---
M puppet/modules/puppet/manifests/agent.pp
M support/puppet-bootstrap.sh
2 files changed, 8 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/76/403076/1
diff --git a/puppet/modules/puppet/manifests/agent.pp
b/puppet/modules/puppet/manifests/agent.pp
index 82f6bab..a9c1cd1 100644
--- a/puppet/modules/puppet/manifests/agent.pp
+++ b/puppet/modules/puppet/manifests/agent.pp
@@ -18,4 +18,11 @@
ensure => $ensure,
enable => $enable,
}
+
+ # T184038: pin puppet to 3.x to prevent accidentally getting Puppet4
+ apt::pin { 'puppet':
+ package => 'puppet',
+ pin => 'version 3.*',
+ priority => 1001,
+ }
}
diff --git a/support/puppet-bootstrap.sh b/support/puppet-bootstrap.sh
index cf64fff..26138b0 100755
--- a/support/puppet-bootstrap.sh
+++ b/support/puppet-bootstrap.sh
@@ -17,4 +17,4 @@
-y \
-o Dpkg::Options::="--force-confdef" \
-o Dpkg::Options::="--force-confold" \
- install puppet >/dev/null 2>&1
+ install puppet=3.\* >/dev/null 2>&1
--
To view, visit https://gerrit.wikimedia.org/r/403076
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I309b193596735d409978132e6784f4ad703151d3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <bda...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
