Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/283726
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/init.pp
M modules/role/manifests/labs/puppetmaster.pp
3 files changed, 4 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/26/283726/1
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/init.pp
b/modules/puppetmaster/manifests/init.pp
index 8e53f87..afb903f 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'
@@ -84,10 +85,7 @@
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..c9ae05c 100644
--- a/modules/role/manifests/labs/puppetmaster.pp
+++ b/modules/role/manifests/labs/puppetmaster.pp
@@ -32,6 +32,7 @@
'ldappassword' => $ldapconfig['proxypass'],
'ldaptls' => true,
'autosign' => true,
+ 'is_labs_master' => true,
};
}
--
To view, visit https://gerrit.wikimedia.org/r/283726
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f8dc6a0234b161601c3affebd562a7a57e9bad2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
