Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/180460
Change subject: apt: remove class apt::puppet
......................................................................
apt: remove class apt::puppet
It was already left as a cleanup class. Sufficient time has passed, we
can remove it now.
Change-Id: I7ebdadc25b54803b32889e066770e181dd691212
---
M modules/apt/manifests/init.pp
D modules/apt/manifests/puppet.pp
M modules/base/manifests/puppet.pp
M modules/puppet/manifests/self/master.pp
M modules/puppetmaster/manifests/init.pp
M modules/puppetmaster/manifests/passenger.pp
6 files changed, 0 insertions(+), 38 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/60/180460/1
diff --git a/modules/apt/manifests/init.pp b/modules/apt/manifests/init.pp
index 43f792f..ae27b7a 100644
--- a/modules/apt/manifests/init.pp
+++ b/modules/apt/manifests/init.pp
@@ -53,9 +53,6 @@
priority => 1001,
}
- # Pin puppet base packages.
- apt::puppet{ 'base':}
-
$http_proxy = "http://webproxy.${::site}.wmnet:8080";
# This will munge /etc/apt/apt.conf that get's created during installation
diff --git a/modules/apt/manifests/puppet.pp b/modules/apt/manifests/puppet.pp
deleted file mode 100644
index ab2bc02..0000000
--- a/modules/apt/manifests/puppet.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-# FIXME: remove this class and all of its callsites after a reasonable time
has passed -2014-12-09
-define apt::puppet (
- $packages = 'puppet puppet-common facter'
- ) {
-
- apt::pin { $title:
- ensure => 'absent',
- package => $packages,
- pin => 'release o=Ubuntu',
- priority => 1002
- }
- apt::pin { "puppet_${title}_2.7.pref":
- ensure => 'absent',
- priority => 0,
- pin => 'release o=Ubuntu'
- }
-}
diff --git a/modules/base/manifests/puppet.pp b/modules/base/manifests/puppet.pp
index a10a9c4..9e497eb 100644
--- a/modules/base/manifests/puppet.pp
+++ b/modules/base/manifests/puppet.pp
@@ -6,10 +6,8 @@
$crontime = $base::puppet::params::crontime
$freshnessinterval = $base::puppet::params::freshnessinterval
-
package { [ 'puppet', 'facter' ]:
ensure => latest,
- require => Apt::Puppet['base']
}
file { '/etc/puppet/puppet.conf':
diff --git a/modules/puppet/manifests/self/master.pp
b/modules/puppet/manifests/self/master.pp
index ec50ba2..c2aa0a9 100644
--- a/modules/puppet/manifests/self/master.pp
+++ b/modules/puppet/manifests/self/master.pp
@@ -58,12 +58,6 @@
require => Class['puppet::self::config'],
}
- # pin puppetmaster packages
- apt::puppet {'puppetmaster':
- packages => 'puppetmaster puppetmaster-common vim-puppet puppet-el',
- before => Package['puppetmaster']
- }
-
package { [
'vim-puppet',
'puppet-el',
diff --git a/modules/puppetmaster/manifests/init.pp
b/modules/puppetmaster/manifests/init.pp
index 13a77f0..1391899 100644
--- a/modules/puppetmaster/manifests/init.pp
+++ b/modules/puppetmaster/manifests/init.pp
@@ -40,10 +40,6 @@
# so the postinst scripts do the right things.
require puppetmaster::config
- apt::puppet {'puppetmaster':
- packages => 'puppetmaster puppetmaster-common vim-puppet puppet-el'
- }
-
package { [
'puppetmaster',
'puppetmaster-common',
@@ -54,7 +50,6 @@
'ruby-json'
]:
ensure => latest,
- require => Apt::Puppet['puppetmaster']
}
if $server_type == 'frontend' {
diff --git a/modules/puppetmaster/manifests/passenger.pp
b/modules/puppetmaster/manifests/passenger.pp
index 0e7d93c..59960bd 100644
--- a/modules/puppetmaster/manifests/passenger.pp
+++ b/modules/puppetmaster/manifests/passenger.pp
@@ -21,11 +21,6 @@
) {
include ::apache::mod::passenger
- apt::puppet { 'passenger':
- packages => 'puppetmaster-passenger',
- before => Package['puppetmaster-passenger'],
- }
-
package { 'puppetmaster-passenger':
ensure => latest,
}
--
To view, visit https://gerrit.wikimedia.org/r/180460
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ebdadc25b54803b32889e066770e181dd691212
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
