Andrew Bogott has submitted this change and it was merged.
Change subject: Organize Ganglia cluster names for labs
......................................................................
Organize Ganglia cluster names for labs
Previously we had some, but not all, labs hosts grouped
into the 'Virtualization cluster.' That was inconsistent
and also not very useful for auditing VM capacity.
Now we have two clusters:
'labvirt' aka 'Labs virt hosts' which contains only the
compute nodes
'labs' aka 'Labs services' which contains all other Labs-related
hosts, excluding the compute nodes.
Change-Id: I654eb47cad184bf972db5e237b620771e8aafec8
---
M hieradata/common.yaml
M hieradata/hosts/holmium.yaml
D hieradata/hosts/labcontrol1001.yaml
D hieradata/hosts/labcontrol1002.yaml
M hieradata/hosts/labmon1001.yaml
D hieradata/hosts/labnet1001.yaml
D hieradata/hosts/labnet1002.yaml
D hieradata/hosts/nembus.yaml
D hieradata/hosts/neptunium.yaml
M hieradata/hosts/silver.yaml
M hieradata/regex.yaml
M hieradata/role/common/nova/compute.yaml
12 files changed, 18 insertions(+), 15 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 26f25ae..acc89d0 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -105,11 +105,16 @@
eqiad: []
codfw: []
esams: []
- virt:
- name: "Virtualization cluster"
+ labvirt:
+ name: "Labs virt hosts"
id: 29
sites:
eqiad: []
+ labs:
+ name: "Labs services"
+ id: 30
+ sites:
+ eqiad: []
jobrunner:
name: "Jobrunners"
id: 31
diff --git a/hieradata/hosts/holmium.yaml b/hieradata/hosts/holmium.yaml
index 781125d..d41687e 100644
--- a/hieradata/hosts/holmium.yaml
+++ b/hieradata/hosts/holmium.yaml
@@ -1,4 +1,4 @@
-cluster: virt
+cluster: labs
labsdnsconfig:
host: 'labs-ns1.wikimedia.org'
diff --git a/hieradata/hosts/labcontrol1001.yaml
b/hieradata/hosts/labcontrol1001.yaml
deleted file mode 100644
index 4559a8a..0000000
--- a/hieradata/hosts/labcontrol1001.yaml
+++ /dev/null
@@ -1 +0,0 @@
-cluster: virt
diff --git a/hieradata/hosts/labcontrol1002.yaml
b/hieradata/hosts/labcontrol1002.yaml
deleted file mode 100644
index 4559a8a..0000000
--- a/hieradata/hosts/labcontrol1002.yaml
+++ /dev/null
@@ -1 +0,0 @@
-cluster: virt
diff --git a/hieradata/hosts/labmon1001.yaml b/hieradata/hosts/labmon1001.yaml
index ae478d3..04132c7 100644
--- a/hieradata/hosts/labmon1001.yaml
+++ b/hieradata/hosts/labmon1001.yaml
@@ -1,3 +1,3 @@
statsite::instance::graphite_host: 'localhost'
statsite::instance::extended_counters: 1
-cluster: "virt"
+cluster: labs
diff --git a/hieradata/hosts/labnet1001.yaml b/hieradata/hosts/labnet1001.yaml
deleted file mode 100644
index 4559a8a..0000000
--- a/hieradata/hosts/labnet1001.yaml
+++ /dev/null
@@ -1 +0,0 @@
-cluster: virt
diff --git a/hieradata/hosts/labnet1002.yaml b/hieradata/hosts/labnet1002.yaml
deleted file mode 100644
index 4559a8a..0000000
--- a/hieradata/hosts/labnet1002.yaml
+++ /dev/null
@@ -1 +0,0 @@
-cluster: virt
diff --git a/hieradata/hosts/nembus.yaml b/hieradata/hosts/nembus.yaml
deleted file mode 100644
index 4559a8a..0000000
--- a/hieradata/hosts/nembus.yaml
+++ /dev/null
@@ -1 +0,0 @@
-cluster: virt
diff --git a/hieradata/hosts/neptunium.yaml b/hieradata/hosts/neptunium.yaml
deleted file mode 100644
index 4559a8a..0000000
--- a/hieradata/hosts/neptunium.yaml
+++ /dev/null
@@ -1 +0,0 @@
-cluster: virt
diff --git a/hieradata/hosts/silver.yaml b/hieradata/hosts/silver.yaml
index 7a9b1ad..ff76c55 100644
--- a/hieradata/hosts/silver.yaml
+++ b/hieradata/hosts/silver.yaml
@@ -1,4 +1,4 @@
-cluster: virt
+cluster: labs
admin::groups:
- deployment
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 767375d..837750a 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -66,9 +66,13 @@
__regex: !ruby/regexp
/^(db20[0-9][0-9]|dbstore200[1-2]|es201[1-9])\.codfw\.wmnet$/
cluster: mysql
-virtualization:
- __regex: !ruby/regexp /^(labnet|labvirt|virt)100[1-9]\.eqiad\.wmnet$/
- cluster: "virt"
+labvirt:
+ __regex: !ruby/regexp /^labvirt10[0-9][0-9]\.eqiad\.wmnet$/
+ cluster: labvirt
+
+labs:
+ __regex: !ruby/regexp
/^(labnet|labservices|labnodepool|labsdb|labstore|labcontrol)100[1-9]\.eqiad\.wmnet$/
+ cluster: labs
cassandra_test_eqiad:
__regex: !ruby/regexp /^(cerium|praseodymium|xenon)\.eqiad\.wmnet$/
diff --git a/hieradata/role/common/nova/compute.yaml
b/hieradata/role/common/nova/compute.yaml
index 981749b..cd73d8c 100644
--- a/hieradata/role/common/nova/compute.yaml
+++ b/hieradata/role/common/nova/compute.yaml
@@ -1,4 +1,4 @@
-cluster: virt
+cluster: labvirt
debdeploy::grains:
debdeploy-nova-compute:
value: standard
--
To view, visit https://gerrit.wikimedia.org/r/289315
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I654eb47cad184bf972db5e237b620771e8aafec8
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Rush <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
