Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/303743
Change subject: puppetmaster: Cleanup some labs intrusions
......................................................................
puppetmaster: Cleanup some labs intrusions
The puppetmaster module shouldn't really know about the
special things that need to happen for labs - this is just
a realm branch by another name. Start cleaning it up.
Change-Id: I735e136943eeb1c92b9c5eb94a443cf89b494d11
---
M modules/puppetmaster/manifests/init.pp
D modules/puppetmaster/manifests/labs.pp
M modules/role/manifests/labs/puppetmaster.pp
3 files changed, 18 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/43/303743/1
diff --git a/modules/puppetmaster/manifests/init.pp
b/modules/puppetmaster/manifests/init.pp
index 7df6a57..aec221e 100644
--- a/modules/puppetmaster/manifests/init.pp
+++ b/modules/puppetmaster/manifests/init.pp
@@ -119,7 +119,6 @@
include puppetmaster::monitoring
if $is_labs_master {
- include puppetmaster::labs
require_package('ruby-httpclient')
$horizon_host = hiera('labs_horizon_host')
diff --git a/modules/puppetmaster/manifests/labs.pp
b/modules/puppetmaster/manifests/labs.pp
deleted file mode 100644
index 820b03d..0000000
--- a/modules/puppetmaster/manifests/labs.pp
+++ /dev/null
@@ -1,24 +0,0 @@
-# Class: puppetmaster::labs
-#
-# This class handles the Wikimedia Labs specific bits of a Puppetmaster
-class puppetmaster::labs {
- if ($::lsbdistcodename == 'precise') {
- package { 'libldap-ruby1.8': ensure => present; }
- }
-
- include puppetmaster::certcleaner
-
- cron { 'update_public_puppet_repos':
- ensure => present,
- command => '(cd /var/lib/git/operations/puppet && /usr/bin/git pull &&
/usr/bin/git submodule update --init) > /dev/null 2>&1',
- user => 'gitpuppet',
- minute => '*/1',
- }
-
- cron { 'update_private_puppet_repos':
- ensure => present,
- command => '(cd /var/lib/git/operations/labs/private && /usr/bin/git
pull) > /dev/null 2>&1',
- user => 'gitpuppet',
- minute => '*/1',
- }
-}
diff --git a/modules/role/manifests/labs/puppetmaster.pp
b/modules/role/manifests/labs/puppetmaster.pp
index a008a8b..105d6f0 100644
--- a/modules/role/manifests/labs/puppetmaster.pp
+++ b/modules/role/manifests/labs/puppetmaster.pp
@@ -33,6 +33,24 @@
};
}
+
+ # Run a cron that pulls the ops/puppet repo & labs/private every minute.
+ # We do not have equivalent of puppet merge for the labs puppetmaster
+ cron { 'update_public_puppet_repos':
+ ensure => present,
+ command => '(cd /var/lib/git/operations/puppet && /usr/bin/git pull &&
/usr/bin/git submodule update --init) > /dev/null 2>&1',
+ user => 'gitpuppet',
+ minute => '*/1',
+ }
+
+ cron { 'update_private_puppet_repos':
+ ensure => present,
+ command => '(cd /var/lib/git/operations/labs/private && /usr/bin/git
pull) > /dev/null 2>&1',
+ user => 'gitpuppet',
+ minute => '*/1',
+ }
+
+ include ::puppetmaster::certsigner
if ! defined(Class['puppetmaster::certmanager']) {
class { 'puppetmaster::certmanager':
remote_cert_cleaner => hiera('labs_certmanager_hostname'),
--
To view, visit https://gerrit.wikimedia.org/r/303743
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I735e136943eeb1c92b9c5eb94a443cf89b494d11
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
