Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/221562
Change subject: Use the labsproject fact rather than $::instanceproject from
ldap
......................................................................
Use the labsproject fact rather than $::instanceproject from ldap
Change-Id: If339c2534516efb8c556b186063153ff67d4b26a
---
M manifests/realm.pp
M manifests/role/analytics/hadoop.pp
M manifests/role/analytics/kafka.pp
M manifests/role/beta.pp
M manifests/role/diamond.pp
M manifests/role/labs.pp
M manifests/role/labstools.pp
M manifests/role/logstash.pp
M manifests/role/salt.pp
M manifests/role/trebuchet.pp
M modules/base/manifests/environment.pp
M modules/base/templates/environment/bash.bashrc.erb
M modules/base/templates/resolv.conf.labs.erb
M modules/labs_bootstrapvz/manifests/init.pp
M modules/labs_vmbuilder/manifests/init.pp
M modules/ldap/manifests/role/config.pp
M modules/ldap/templates/nslcd.conf.erb
M modules/puppetmaster/files/labs.hiera.yaml
M modules/toollabs/manifests/bastion.pp
M modules/toollabs/manifests/compute.pp
M modules/toollabs/manifests/infrastructure.pp
M modules/toollabs/manifests/node/compute/dedicated.pp
M modules/toollabs/manifests/proxy.pp
M modules/toollabs/manifests/submit.pp
M modules/toollabs/templates/exim4.conf.erb
M modules/wmflib/lib/hiera/backend/mwyaml_backend.rb
26 files changed, 42 insertions(+), 46 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/62/221562/1
diff --git a/manifests/realm.pp b/manifests/realm.pp
index 08f9c0e..677ce14 100644
--- a/manifests/realm.pp
+++ b/manifests/realm.pp
@@ -6,12 +6,8 @@
$realm = 'production'
}
-if $::instanceproject == undef {
- $instanceproject = ''
-}
-
if $::projectgroup == undef {
- $projectgroup = "project-${instanceproject}"
+ $projectgroup = "project-${labsproject}"
}
# Determine the site the server is in
@@ -167,7 +163,7 @@
# Route list for mail coming from MediaWiki mailer
$wikimail_smarthost = $::realm ? {
'production' => [ 'wiki-mail-eqiad.wikimedia.org' ],
- 'labs' => $::instanceproject ? {
+ 'labs' => $::labsproject ? {
'deployment-prep' => [ 'deployment-mx.eqiad.wmflabs' ],
default => [ 'polonium.wikimedia.org', 'lead.wikimedia.org'
],
}
diff --git a/manifests/role/analytics/hadoop.pp
b/manifests/role/analytics/hadoop.pp
index 75450d5..8a37190 100644
--- a/manifests/role/analytics/hadoop.pp
+++ b/manifests/role/analytics/hadoop.pp
@@ -300,7 +300,7 @@
$gelf_logging_port = 12201
# In labs, make sure that HDFS user directories are
# created for everyone in the current labs project.
- $hadoop_users_posix_groups = $::instanceproject
+ $hadoop_users_posix_groups = $::labsproject
# Hadoop directories in labs should be automatically created.
# This conditional could be added to each of the main classes
diff --git a/manifests/role/analytics/kafka.pp
b/manifests/role/analytics/kafka.pp
index b60f51b..d6ab880 100644
--- a/manifests/role/analytics/kafka.pp
+++ b/manifests/role/analytics/kafka.pp
@@ -16,12 +16,12 @@
#
class role::analytics::kafka::config {
if ($::realm == 'labs') {
- # In labs, this can be set via hiera, or default to $::instanceproject
- $kafka_cluster_name =
hiera('role::analytics::kafka::config::kafka_cluster_name', $::instanceproject)
+ # In labs, this can be set via hiera, or default to $::labsproject
+ $kafka_cluster_name =
hiera('role::analytics::kafka::config::kafka_cluster_name', $::labsproject)
# Look up cluster config via hiera.
# This will default to configuring a kafka cluster named
- # after $::instanceproject with a single kafka broker
+ # after $::labsproject with a single kafka broker
# that is the current host
$cluster_config = hiera(
'role::analytics::kafka::config::cluster_config',
diff --git a/manifests/role/beta.pp b/manifests/role/beta.pp
index 8ff5b39..f012ec1 100644
--- a/manifests/role/beta.pp
+++ b/manifests/role/beta.pp
@@ -55,7 +55,7 @@
diamond::collector { 'VarnishStatus':
source => 'puppet:///modules/diamond/collector/varnishstatus.py',
settings => {
- path_prefix => $::instanceproject,
+ path_prefix => $::labsproject,
path => 'availability',
}
}
diff --git a/manifests/role/diamond.pp b/manifests/role/diamond.pp
index bd48fb7..26762c6 100644
--- a/manifests/role/diamond.pp
+++ b/manifests/role/diamond.pp
@@ -5,7 +5,7 @@
'labs': {
$host = '10.64.37.13' # labmon1001
# Prefix labs metrics with project name
- $path_prefix = $::instanceproject
+ $path_prefix = $::labsproject
$keep_logs_for = '0' # Current day only
$service = true
}
diff --git a/manifests/role/labs.pp b/manifests/role/labs.pp
index 8e5fb87..d4a36da 100644
--- a/manifests/role/labs.pp
+++ b/manifests/role/labs.pp
@@ -47,7 +47,7 @@
atboot => true,
fstype => 'nfs',
options => "rw,${nfs_opts}",
- device => "${nfs_server}:/project/${instanceproject}/home",
+ device => "${nfs_server}:/project/${labsproject}/home",
require => File['/etc/modprobe.d/nfs-no-idmap'],
}
}
@@ -73,7 +73,7 @@
atboot => true,
fstype => 'nfs',
options => "rw,${nfs_opts}",
- device => "${nfs_server}:/project/${instanceproject}/project",
+ device => "${nfs_server}:/project/${labsproject}/project",
require => File['/data/project', '/etc/modprobe.d/nfs-no-idmap'],
}
}
diff --git a/manifests/role/labstools.pp b/manifests/role/labstools.pp
index d3170f6..fd8f7d5 100644
--- a/manifests/role/labstools.pp
+++ b/manifests/role/labstools.pp
@@ -2,7 +2,7 @@
class role::labs::tools {
class common {
- $gridmaster = "${::instanceproject}-master.${::site}.wmflabs"
+ $gridmaster = "${::labsproject}-master.${::site}.wmflabs"
class { 'gridengine': gridmaster => $gridmaster }
}
@@ -76,7 +76,7 @@
class mailrelay inherits role::labs::tools::common {
system::role { 'role::labs::tools::mailrelay': description => 'Tool
Labs mail relay' }
- $maildomain_project = $::instanceproject ? {
+ $maildomain_project = $::labsproject ? {
'toolsbeta' => 'tools-beta.wmflabs.org',
default => 'tools.wmflabs.org',
}
diff --git a/manifests/role/logstash.pp b/manifests/role/logstash.pp
index d0a0152..00fc2e7 100644
--- a/manifests/role/logstash.pp
+++ b/manifests/role/logstash.pp
@@ -104,7 +104,7 @@
require ::role::logstash
$irc_name = $::logstash_irc_name ? {
- undef => "logstash-${::instanceproject}",
+ undef => "logstash-${::labsproject}",
default => $::logstash_irc_name,
}
diff --git a/manifests/role/salt.pp b/manifests/role/salt.pp
index 3ed4674..bf85575 100644
--- a/manifests/role/salt.pp
+++ b/manifests/role/salt.pp
@@ -99,8 +99,8 @@
$master = pick($salt_master, $labs_masters)
$master_finger = pick($salt_finger, $labs_finger)
- salt::grain { 'instanceproject':
- value => $::instanceproject,
+ salt::grain { 'labsproject':
+ value => $::labsproject,
}
} else {
$master = 'palladium.eqiad.wmnet'
diff --git a/manifests/role/trebuchet.pp b/manifests/role/trebuchet.pp
index d0cd206..7f84896 100644
--- a/manifests/role/trebuchet.pp
+++ b/manifests/role/trebuchet.pp
@@ -9,7 +9,7 @@
) {
$trebuchet_master = $::realm ? {
production => 'tin.eqiad.wmnet',
- labs => pick($deployment_server,
"${::instanceproject}-deploy.eqiad.wmflabs"),
+ labs => pick($deployment_server,
"${::labsproject}-deploy.eqiad.wmflabs"),
}
include ::trebuchet::packages
diff --git a/modules/base/manifests/environment.pp
b/modules/base/manifests/environment.pp
index a8c1ecc..9a35bee 100644
--- a/modules/base/manifests/environment.pp
+++ b/modules/base/manifests/environment.pp
@@ -58,12 +58,12 @@
content => "${::instancename}\n",
}
}
- if( $::instanceproject ) {
+ if( $::labsproject ) {
file { '/etc/wmflabs-project':
owner => 'root',
group => 'root',
mode => '0444',
- content => "${::instanceproject}\n",
+ content => "${::labsproject}\n",
}
}
} # /labs
diff --git a/modules/base/templates/environment/bash.bashrc.erb
b/modules/base/templates/environment/bash.bashrc.erb
index 5eab4f8..cfbd746 100644
--- a/modules/base/templates/environment/bash.bashrc.erb
+++ b/modules/base/templates/environment/bash.bashrc.erb
@@ -35,8 +35,8 @@
PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
<% end %>
-<% if has_variable?("instanceproject") then %>
-export INSTANCEPROJECT=<%= @instanceproject %>
+<% if has_variable?("labsproject") then %>
+export INSTANCEPROJECT=<%= @labsproject %>
<% end %>
# Commented out, don't overwrite xterm -T "title" -n "icontitle" by default.
diff --git a/modules/base/templates/resolv.conf.labs.erb
b/modules/base/templates/resolv.conf.labs.erb
index fd04381..7495e29 100644
--- a/modules/base/templates/resolv.conf.labs.erb
+++ b/modules/base/templates/resolv.conf.labs.erb
@@ -3,8 +3,8 @@
## source: modules/base/resolv.conf.labs.erb
## from: base::resolving
-domain <%= @instanceproject %>.<%= @site %>.wmflabs
-search <%= @instanceproject %>.<%= @site %>.wmflabs <%= @site %>.wmflabs
+domain <%= @labsproject %>.<%= @site %>.wmflabs
+search <%= @labsproject %>.<%= @site %>.wmflabs <%= @site %>.wmflabs
<% scope.lookupvar('::nameservers').sort.each do |nsip| -%>
nameserver <%= nsip %>
<% end -%>
diff --git a/modules/labs_bootstrapvz/manifests/init.pp
b/modules/labs_bootstrapvz/manifests/init.pp
index 3f67825..10d0f11 100644
--- a/modules/labs_bootstrapvz/manifests/init.pp
+++ b/modules/labs_bootstrapvz/manifests/init.pp
@@ -52,7 +52,7 @@
require => File["${bootstrap_filepath}/firstscripts"],
}
- $projectregex = "s/${instanceproject}/_PROJECT_/g"
+ $projectregex = "s/${labsproject}/_PROJECT_/g"
$fqdnregex = "s/${::fqdn}/_FQDN_/g"
# We can't just use $::servername here because the master
diff --git a/modules/labs_vmbuilder/manifests/init.pp
b/modules/labs_vmbuilder/manifests/init.pp
index 5fcde45..1ed3e6c 100644
--- a/modules/labs_vmbuilder/manifests/init.pp
+++ b/modules/labs_vmbuilder/manifests/init.pp
@@ -65,7 +65,7 @@
],
}
- $projectregex = "s/${instanceproject}/_PROJECT_/g"
+ $projectregex = "s/${labsproject}/_PROJECT_/g"
$fqdnregex = "s/${::fqdn}/_FQDN_/g"
# We can't just use $::servername here because the master
diff --git a/modules/ldap/manifests/role/config.pp
b/modules/ldap/manifests/role/config.pp
index 43607be..5c8544b 100644
--- a/modules/ldap/manifests/role/config.pp
+++ b/modules/ldap/manifests/role/config.pp
@@ -7,7 +7,7 @@
'codfw' => [ 'ldap-codfw.wikimedia.org', 'ldap-eqiad.wikimedia.org' ],
}
$sudobasedn = $::realm ? {
- 'labs' =>
"ou=sudoers,cn=${instanceproject},ou=projects,${basedn}",
+ 'labs' => "ou=sudoers,cn=${labsproject},ou=projects,${basedn}",
'production' => "ou=sudoers,${basedn}"
}
$ldapconfig = {
diff --git a/modules/ldap/templates/nslcd.conf.erb
b/modules/ldap/templates/nslcd.conf.erb
index 3b0f25e..28ef51e 100644
--- a/modules/ldap/templates/nslcd.conf.erb
+++ b/modules/ldap/templates/nslcd.conf.erb
@@ -21,10 +21,10 @@
base shadow <%= @ldapconfig["users_rdn"] %>,ou=servicegroups,<%=
@ldapconfig["basedn"] %>
base group ou=servicegroups,<%= @ldapconfig["basedn"] %>
<% elsif @realm == "labs" -%>
-<% if has_variable?("instanceproject") then -%>
-base passwd <%= @ldapconfig["users_rdn"] %>,cn=<%= instanceproject
%>,ou=projects,<%= @ldapconfig["basedn"] %>
-base shadow <%= @ldapconfig["users_rdn"] %>,cn=<%= instanceproject
%>,ou=projects,<%= @ldapconfig["basedn"] %>
-base group <%= @ldapconfig["groups_rdn"] %>,cn=<%= instanceproject
%>,ou=projects,<%= @ldapconfig["basedn"] %>
+<% if has_variable?("labsproject") then -%>
+base passwd <%= @ldapconfig["users_rdn"] %>,cn=<%= labsproject
%>,ou=projects,<%= @ldapconfig["basedn"] %>
+base shadow <%= @ldapconfig["users_rdn"] %>,cn=<%= labsproject
%>,ou=projects,<%= @ldapconfig["basedn"] %>
+base group <%= @ldapconfig["groups_rdn"] %>,cn=<%= labsproject
%>,ou=projects,<%= @ldapconfig["basedn"] %>
<% end %><% end -%>
# The DN to bind with for normal lookups.
diff --git a/modules/puppetmaster/files/labs.hiera.yaml
b/modules/puppetmaster/files/labs.hiera.yaml
index 51614d7..8612096 100644
--- a/modules/puppetmaster/files/labs.hiera.yaml
+++ b/modules/puppetmaster/files/labs.hiera.yaml
@@ -9,9 +9,9 @@
:private:
:datadir: /etc/puppet/private/hieradata
:hierarchy:
- - "labs/%{::instanceproject}/host/%{::hostname}"
- - "labs/%{::instanceproject}/common"
+ - "labs/%{::labsproject}/host/%{::hostname}"
+ - "labs/%{::labsproject}/common"
- "labs"
- - "private/%{::instanceproject}"
+ - "private/%{::labsproject}"
- common
- "private/common"
diff --git a/modules/toollabs/manifests/bastion.pp
b/modules/toollabs/manifests/bastion.pp
index 92e5d50..5471a44 100644
--- a/modules/toollabs/manifests/bastion.pp
+++ b/modules/toollabs/manifests/bastion.pp
@@ -29,7 +29,7 @@
motd::script { 'bastion-banner':
ensure => present,
- source =>
"puppet:///modules/toollabs/40-${::instanceproject}-bastion-banner",
+ source =>
"puppet:///modules/toollabs/40-${::labsproject}-bastion-banner",
}
file { "${toollabs::store}/submithost-${::fqdn}":
diff --git a/modules/toollabs/manifests/compute.pp
b/modules/toollabs/manifests/compute.pp
index 59a60fd..08fa2f2 100644
--- a/modules/toollabs/manifests/compute.pp
+++ b/modules/toollabs/manifests/compute.pp
@@ -21,7 +21,7 @@
motd::script { 'exechost-banner':
ensure => present,
- source =>
"puppet:///modules/toollabs/40-${::instanceproject}-exechost-banner",
+ source =>
"puppet:///modules/toollabs/40-${::labsproject}-exechost-banner",
}
file { "${toollabs::store}/execnode-${::fqdn}":
diff --git a/modules/toollabs/manifests/infrastructure.pp
b/modules/toollabs/manifests/infrastructure.pp
index d1134f0..5ce7e6e 100644
--- a/modules/toollabs/manifests/infrastructure.pp
+++ b/modules/toollabs/manifests/infrastructure.pp
@@ -16,7 +16,7 @@
motd::script { 'infrastructure-banner':
ensure => present,
- source =>
"puppet:///modules/toollabs/40-${::instanceproject}-infrastructure-banner",
+ source =>
"puppet:///modules/toollabs/40-${::labsproject}-infrastructure-banner",
}
# Infrastructure instances are limited to an (arbitrarily picked) local
@@ -24,6 +24,6 @@
File <| title == '/etc/security/access.conf' |> {
source => undef,
- content => "-:ALL EXCEPT (${::instanceproject}.admin) root:ALL\n",
+ content => "-:ALL EXCEPT (${::labsproject}.admin) root:ALL\n",
}
}
diff --git a/modules/toollabs/manifests/node/compute/dedicated.pp
b/modules/toollabs/manifests/node/compute/dedicated.pp
index 29b7804..9476b3e 100644
--- a/modules/toollabs/manifests/node/compute/dedicated.pp
+++ b/modules/toollabs/manifests/node/compute/dedicated.pp
@@ -15,7 +15,7 @@
if $::node_dedicated_tool {
system::role { 'toollabs::node::compute::dedicated':
- description => "Computation node dedicated to
${::instanceproject}.${::node_dedicated_tool}",
+ description => "Computation node dedicated to
${::labsproject}.${::node_dedicated_tool}",
}
class { 'toollabs::queues': queues => [ $::node_dedicated_tool ] }
diff --git a/modules/toollabs/manifests/proxy.pp
b/modules/toollabs/manifests/proxy.pp
index 2594bed..2293e4e 100644
--- a/modules/toollabs/manifests/proxy.pp
+++ b/modules/toollabs/manifests/proxy.pp
@@ -73,8 +73,8 @@
git::clone { 'labs/toollabs':
ensure => latest,
directory => '/data/project/admin/toollabs',
- owner => "${instanceproject}.admin",
- group => "${instanceproject}.admin",
+ owner => "${::labsproject}.admin",
+ group => "${::labsproject}.admin",
mode => '2755',
}
diff --git a/modules/toollabs/manifests/submit.pp
b/modules/toollabs/manifests/submit.pp
index cea5b4e..456c217 100644
--- a/modules/toollabs/manifests/submit.pp
+++ b/modules/toollabs/manifests/submit.pp
@@ -28,7 +28,7 @@
motd::script { 'submithost-banner':
ensure => present,
- source =>
"puppet:///modules/toollabs/40-${::instanceproject}-submithost-banner",
+ source =>
"puppet:///modules/toollabs/40-${::labsproject}-submithost-banner",
}
file { "${toollabs::store}/submithost-${::fqdn}":
diff --git a/modules/toollabs/templates/exim4.conf.erb
b/modules/toollabs/templates/exim4.conf.erb
index 86e23e3..a104d62 100644
--- a/modules/toollabs/templates/exim4.conf.erb
+++ b/modules/toollabs/templates/exim4.conf.erb
@@ -8,7 +8,7 @@
# Macros #
##########
-INSTANCEPROJECT=<%= @instanceproject %>
+INSTANCEPROJECT=<%= @labsproject %>
MAILDOMAIN=<%= @maildomain %>
###############################
diff --git a/modules/wmflib/lib/hiera/backend/mwyaml_backend.rb
b/modules/wmflib/lib/hiera/backend/mwyaml_backend.rb
index 1fdf2f6..74384ca 100644
--- a/modules/wmflib/lib/hiera/backend/mwyaml_backend.rb
+++ b/modules/wmflib/lib/hiera/backend/mwyaml_backend.rb
@@ -12,7 +12,7 @@
Backend.datasources(scope, order_override) do |source|
# Small hack: - we don't want to search any datasource but the
- # labs/%{::instanceproject} hierarchy here; so we plainly exit
+ # labs/%{::labsproject} hierarchy here; so we plainly exit
# in any other case
next unless source[0,5] == 'labs/'
source_arr = source.split('/')
--
To view, visit https://gerrit.wikimedia.org/r/221562
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If339c2534516efb8c556b186063153ff67d4b26a
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
