[MediaWiki-commits] [Gerrit] operations/puppet[production]: site.pp: reorganize labs host to use one role() call per node

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/402786 )

Change subject: site.pp: reorganize labs host to use one role() call per node
......................................................................


site.pp: reorganize labs host to use one role() call per node

Change-Id: I11cb24767dbd7fa1d4d5e69e702e0c376859abcd
---
R hieradata/role/common/labs/monitoring.yaml
M manifests/site.pp
A modules/role/manifests/labs/monitoring.pp
3 files changed, 15 insertions(+), 10 deletions(-)

Approvals:
  Giuseppe Lavagetto: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/hieradata/role/common/labs/prometheus.yaml 
b/hieradata/role/common/labs/monitoring.yaml
similarity index 100%
rename from hieradata/role/common/labs/prometheus.yaml
rename to hieradata/role/common/labs/monitoring.yaml
diff --git a/manifests/site.pp b/manifests/site.pp
index 49e8038..3b4fa25 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1140,8 +1140,8 @@
 #  - silver (wikitech.wikimedia.org), and
 #  - californium (horizon.wikimedia.org)
 node 'labtestweb2001.wikimedia.org' {
-    role(wmcs::openstack::labtest::web,
-          mariadb::wikitech)
+    role(wmcs::openstack::labtest::web)
+    include ::role::mariadb::wikitech
     include ::base::firewall
     include ::ldap::role::client::labs
 
@@ -1150,11 +1150,7 @@
 
 # Labs Graphite and StatsD host
 node 'labmon1001.eqiad.wmnet' {
-    role(labs::graphite,
-          labs::prometheus,
-          grafana::labs)
-    include ::standard
-    include ::base::firewall
+    role(labs::monitoring)
 }
 
 # role spare until pushed into service via T165784
@@ -1192,7 +1188,8 @@
 }
 
 node 'labsdb1004.eqiad.wmnet' {
-    role(postgres::master, labs::db::slave)
+    role(postgres::master)
+    include ::role::labs::db::slave
 }
 
 node 'labsdb1005.eqiad.wmnet' {
@@ -1992,8 +1989,8 @@
 
 # Silver is the new home of the wikitech web server.
 node 'silver.wikimedia.org' {
-    role(wmcs::openstack::main::wikitech,
-          mariadb::wikitech)
+    role(wmcs::openstack::main::wikitech)
+    include ::role::mariadb::wikitech
     include ::base::firewall
     include ::standard
 
diff --git a/modules/role/manifests/labs/monitoring.pp 
b/modules/role/manifests/labs/monitoring.pp
new file mode 100644
index 0000000..30ef498
--- /dev/null
+++ b/modules/role/manifests/labs/monitoring.pp
@@ -0,0 +1,8 @@
+class role::labs::monitoring {
+    system::role { 'labs::monitoring': }
+    include ::role::labs::graphite
+    include ::role::labs::prometheus
+    include ::role::grafana::labs
+    include standard
+    include ::base::firewall
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/402786
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I11cb24767dbd7fa1d4d5e69e702e0c376859abcd
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits