Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/283201
Change subject: scap: use conftool data to populate dsh groups
......................................................................
scap: use conftool data to populate dsh groups
Bug: T132529
Change-Id: If164c59b6d83da836a1699c864713efeb8d6047f
---
M modules/scap/manifests/dsh.pp
A modules/scap/templates/dsh/mediawiki-installation.erb
A modules/scap/templates/dsh/parsoid.erb
3 files changed, 67 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/01/283201/1
diff --git a/modules/scap/manifests/dsh.pp b/modules/scap/manifests/dsh.pp
index 15ddb72..abef98b 100644
--- a/modules/scap/manifests/dsh.pp
+++ b/modules/scap/manifests/dsh.pp
@@ -26,11 +26,33 @@
mode => '0444',
}
file { '/etc/dsh/group':
+ ensure => directory,
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ }
+
+ $appserver_eqiad =
conftool('dc=eqiad,cluster=appserver,service=apache2','all')
+ $appserver_codfw =
conftool('dc=codfw,cluster=appserver,service=apache2','all')
+ $api_eqiad =
conftool('dc=eqiad,cluster=api_appserver,service=apache2','all')
+ $api_codfw =
conftool('dc=codfw,cluster=api_appserver,service=apache2','all')
+ $parsoid_eqiad = conftool('dc=eqiad,cluster=parsoid,service=parsoid','all')
+ $parsoid_codfw = conftool('dc=codfw,cluster=parsoid,service=parsoid','all')
+
+ file { '/etc/dsh/group/mediawiki-installation':
+ ensure => present,
owner => 'root',
group => 'root',
mode => '0444',
- source => $group_source,
- recurse => true,
+ content => template('scap/dsh/mediawiki-installation.erb')
+ }
+
+ file { '/etc/dsh/group/parsoid':
+ ensure => present,
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ content => template('scap/dsh/parsoid.erb')
}
file { '/etc/dsh/group/scap-proxies':
diff --git a/modules/scap/templates/dsh/mediawiki-installation.erb
b/modules/scap/templates/dsh/mediawiki-installation.erb
new file mode 100644
index 0000000..757fa07
--- /dev/null
+++ b/modules/scap/templates/dsh/mediawiki-installation.erb
@@ -0,0 +1,38 @@
+# dsh group for mediawiki installation
+# This file is used by scap, and is mantained by puppet.
+
+# Non load-balanced hosts
+
+# deployment
+tin.eqiad.wmnet
+mira.codfw.wmnet
+
+# maintenance
+terbium.eqiad.wmnet
+wasat.codfw.wmnet
+
+# wikitech
+silver.wikimedia.org
+
+# snapshots
+snapshot1001.eqiad.wmnet
+snapshot1002.eqiad.wmnet
+snapshot1003.eqiad.wmnet
+snapshot1004.eqiad.wmnet
+snapshot1005.eqiad.wmnet
+snapshot1006.eqiad.wmnet
+snapshot1007.eqiad.wmnet
+
+# Eqiad main
+<%= @appserver_eqiad.keys.sort.join("\n") %>
+
+# Eqiad api
+<%= @api_eqiad.keys.sort.join("\n") %>
+
+# Codfw main
+<%= @appserver_codfw.keys.sort.join("\n") %>
+
+# Codfw api
+<%= @api_codfw.keys.sort.join("\n") %>
+
+
diff --git a/modules/scap/templates/dsh/parsoid.erb
b/modules/scap/templates/dsh/parsoid.erb
new file mode 100644
index 0000000..c65bfa6
--- /dev/null
+++ b/modules/scap/templates/dsh/parsoid.erb
@@ -0,0 +1,5 @@
+# dsh group for parsoid
+# This file is used by scap, and is mantained by puppet.
+
+<%= @parsoid_eqiad.keys.sort.join("\n") %>
+<%= @parsoid_eqiad.keys.sort.join("\n") %>
--
To view, visit https://gerrit.wikimedia.org/r/283201
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If164c59b6d83da836a1699c864713efeb8d6047f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
