Andrew Bogott has submitted this change and it was merged.
Change subject: Eliminate the old, unlintable us_labs_puppet_master global
......................................................................
Eliminate the old, unlintable us_labs_puppet_master global
Change-Id: I0f8dc6a0234b161601c3affebd562a7a57e9bad2
---
M manifests/site.pp
M modules/puppetmaster/manifests/gitclone.pp
M modules/puppetmaster/manifests/init.pp
M modules/role/manifests/labs/puppetmaster.pp
4 files changed, 15 insertions(+), 17 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 7a99289..173550a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1208,7 +1208,6 @@
node 'labtestcontrol2001.wikimedia.org' {
$is_puppet_master = true
- $is_labs_puppet_master = true
include standard
role labs::openstack::nova::controller,
@@ -1340,7 +1339,6 @@
node 'labcontrol1001.wikimedia.org' {
$is_puppet_master = true
- $is_labs_puppet_master = true
role labs::openstack::nova::controller,
labs::puppetmaster,
@@ -1363,7 +1361,6 @@
# 'keystone endpoint-create' and 'keystone endpoint-delete.'
node 'labcontrol1002.wikimedia.org' {
$is_puppet_master = true
- $is_labs_puppet_master = true
role labs::openstack::nova::controller,
labs::puppetmaster,
diff --git a/modules/puppetmaster/manifests/gitclone.pp
b/modules/puppetmaster/manifests/gitclone.pp
index 1dda9e0..fd5b795 100644
--- a/modules/puppetmaster/manifests/gitclone.pp
+++ b/modules/puppetmaster/manifests/gitclone.pp
@@ -1,7 +1,9 @@
# Class: puppetmaster::gitclone
#
# This class handles the repositories from which the puppetmasters pull
-class puppetmaster::gitclone {
+class puppetmaster::gitclone(
+ $is_labs_master = false
+ ){
class { '::puppetmaster::base_repo':
gitdir => $::puppetmaster::gitdir,
@@ -57,10 +59,7 @@
mode => '0640';
}
- # FIXME - top-scope var without namespace, will break in puppet 2.8
- # lint:ignore:variable_scope
- if ! $is_labs_puppet_master {
- # lint:endignore
+ if ! $is_labs_master {
# Set up private repo.
# Note that puppet does not actually clone the repo -- puppetizing that
# turns out to be a big, insecure mess. On a new puppetmaster you will
diff --git a/modules/puppetmaster/manifests/init.pp
b/modules/puppetmaster/manifests/init.pp
index 8e53f87..e2b08ec 100644
--- a/modules/puppetmaster/manifests/init.pp
+++ b/modules/puppetmaster/manifests/init.pp
@@ -34,7 +34,8 @@
'*.ulsfo.wmnet',
'*.esams.wmnet',
'*.codfw.wmnet',
- ]
+ ],
+ $is_labs_master=false,
){
$gitdir = '/var/lib/git'
@@ -78,16 +79,16 @@
ca => $config['ca']
}
+ class { 'puppetmaster::gitclone':
+ is_labs_master => $is_labs_master,
+ }
+
include puppetmaster::scripts
include puppetmaster::geoip
- include puppetmaster::gitclone
include puppetmaster::gitpuppet
include puppetmaster::monitoring
- # FIXME - top-scope var without namespace ($is_labs_puppet_master), will
break in puppet 2.8
- # lint:ignore:variable_scope
- if $is_labs_puppet_master {
- # lint:endignore
+ if $is_labs_master {
include puppetmaster::labs
require_package('ruby-httpclient')
diff --git a/modules/role/manifests/labs/puppetmaster.pp
b/modules/role/manifests/labs/puppetmaster.pp
index 78e5648..17c5cb7 100644
--- a/modules/role/manifests/labs/puppetmaster.pp
+++ b/modules/role/manifests/labs/puppetmaster.pp
@@ -20,9 +20,10 @@
$allow_from = flatten([$labs_ranges, '208.80.154.14', $labs_metal])
class { '::puppetmaster':
- server_name => hiera('labs_puppet_master'),
- allow_from => $allow_from,
- config => {
+ server_name => hiera('labs_puppet_master'),
+ allow_from => $allow_from,
+ is_labs_master => true,
+ config => {
'thin_storeconfigs' => false,
'node_terminus' => 'ldap',
'ldapserver' => $ldapconfig['servernames'][0],
--
To view, visit https://gerrit.wikimedia.org/r/283726
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0f8dc6a0234b161601c3affebd562a7a57e9bad2
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
