jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/403096 )
Change subject: Revert "puppet: pin to version 3.*"
......................................................................
Revert "puppet: pin to version 3.*"
Undo Puppet3 pinning when we have merged the stretch-migration branch which
migrates our Puppet tree to a Puppet4 compatible format.
This reverts commit 458e47cff5ae09695d724e801e3b1c5d2fb49226.
Change-Id: I3eb187c047efa37a23263d5eb60b9bccdc26d57c
---
M puppet/modules/puppet/manifests/agent.pp
M support/puppet-bootstrap.sh
2 files changed, 1 insertion(+), 8 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/puppet/manifests/agent.pp
b/puppet/modules/puppet/manifests/agent.pp
index a9c1cd1..82f6bab 100644
--- a/puppet/modules/puppet/manifests/agent.pp
+++ b/puppet/modules/puppet/manifests/agent.pp
@@ -18,11 +18,4 @@
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 afec9e8..cf64fff 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=3.\* puppet-common=3.\* >/dev/null 2>&1
+ install puppet >/dev/null 2>&1
--
To view, visit https://gerrit.wikimedia.org/r/403096
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3eb187c047efa37a23263d5eb60b9bccdc26d57c
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Dduvall <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
