Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/312317
Change subject: puppetmaster: Cleanup unused vars / crons in labs puppetmaster
......................................................................
puppetmaster: Cleanup unused vars / crons in labs puppetmaster
Change-Id: Ia615dab9b7949091c92bf0ca5617de1c45c2c5ec
---
M modules/role/manifests/labs/puppetmaster.pp
1 file changed, 0 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/17/312317/1
diff --git a/modules/role/manifests/labs/puppetmaster.pp
b/modules/role/manifests/labs/puppetmaster.pp
index 44c998e..5d8d99e 100644
--- a/modules/role/manifests/labs/puppetmaster.pp
+++ b/modules/role/manifests/labs/puppetmaster.pp
@@ -9,8 +9,6 @@
include puppetmaster::labsrootpass
$labs_metal = hiera('labs_baremetal_servers', [])
- $ldapconfig = $ldap::role::config::labs::ldapconfig
- $basedn = $ldapconfig['basedn']
$novaconfig = hiera_hash('novaconfig', {})
$labs_instance_range = $novaconfig['fixed_range']
$horizon_host = hiera('labs_horizon_host')
@@ -28,21 +26,7 @@
use_enc => $use_enc,
extra_auth_rules =>
template('role/labs/puppetmaster/extra_auth_rules.conf.erb'),
server_name => hiera('labs_puppet_master'),
- }
- # Kill these crons, since role::puppetmaster::standalone does this for us
- cron { 'update_public_puppet_repos':
- ensure => absent,
- 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 => absent,
- command => '(cd /var/lib/git/operations/labs/private && /usr/bin/git
pull) > /dev/null 2>&1',
- user => 'gitpuppet',
- minute => '*/1',
}
include ::puppetmaster::certcleaner
--
To view, visit https://gerrit.wikimedia.org/r/312317
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia615dab9b7949091c92bf0ca5617de1c45c2c5ec
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <yuvipa...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
