Giuseppe Lavagetto has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340771 )
Change subject: conftool: change of schema for discovery
......................................................................
conftool: change of schema for discovery
We change the tag to refer to a label, instead of cluster/service
directly, and also add a field to reference the cluster/service objects that are
related to this discovery object.
Change-Id: I0d90f164ad937a58b208514e2ec6ea2ccef8fd0a
---
M conftool-data/discovery/mediawiki.yaml
M conftool-data/discovery/services.yaml
M modules/profile/files/conftool/schema.yaml
3 files changed, 35 insertions(+), 54 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/71/340771/1
diff --git a/conftool-data/discovery/mediawiki.yaml
b/conftool-data/discovery/mediawiki.yaml
index fb12e6f..5ac5edf 100644
--- a/conftool-data/discovery/mediawiki.yaml
+++ b/conftool-data/discovery/mediawiki.yaml
@@ -1,17 +1,9 @@
-mediawiki:
- readwrite: [eqiad, codfw]
- readonly: [eqiad, codfw]
-appserver:
- apache2: [eqiad, codfw]
- nginx: [eqiad, codfw]
-api_appserver:
- apache2: [eqiad, codfw]
- nginx: [eqiad, codfw]
-imagescaler:
- apache2: [eqiad, codfw]
- nginx: [eqiad, codfw]
-swift:
- swift-fe: [eqiad, codfw]
- nginx: [eqiad, codfw]
-thumbor:
- thumbor: [eqiad]
+appservers_rw: [eqiad, codfw]
+appservers_ro: [eqiad, codfw]
+api_rw: [eqiad, codfw]
+api_ro: [eqiad, codfw]
+imagescaler_rw: [eqiad, codfw]
+imagescaler_ro: [eqiad, codfw]
+swift_rw: [eqiad, codfw]
+swift_ro: [eqiad, codfw]
+thumbor: [eqiad, codfw]
diff --git a/conftool-data/discovery/services.yaml
b/conftool-data/discovery/services.yaml
index 9240bd7..192413b 100644
--- a/conftool-data/discovery/services.yaml
+++ b/conftool-data/discovery/services.yaml
@@ -1,32 +1,20 @@
-parsoid:
- parsoid: [eqiad, codfw]
-elasticsearch:
- elasticsearch: [eqiad, codfw]
- elasticsearch-ssl: [eqiad, codfw]
-pdf:
- ocg: [eqiad]
-sca:
- zotero: [eqiad, codfw]
-scb:
- mobileapps: [eqiad, codfw]
- eventstreams: [eqiad, codfw]
- mathoid: [eqiad, codfw]
- graphoid: [eqiad, codfw]
- citoid: [eqiad, codfw]
- apertium: [eqiad, codfw]
- cxserver: [eqiad, codfw]
- ores: [eqiad, codfw]
- pdfrender: [eqiad, codfw]
- trendingedits: [eqiad, codfw]
-restbase:
- restbase: [eqiad, codfw]
-maps:
- kartotherian: [eqiad, codfw]
-aqs:
- aqs: [eqiad]
-eventbus:
- eventbus: [eqiad, codfw]
-wdqs:
- wdqs: [eqiad, codfw]
-logstash:
- kibana: [eqiad]
+parsoid: [eqiad, codfw]
+elasticsearch: [eqiad, codfw]
+ocg: [eqiad]
+zotero: [eqiad, codfw]
+mobileapps: [eqiad, codfw]
+eventstreams: [eqiad, codfw]
+mathoid: [eqiad, codfw]
+graphoid: [eqiad, codfw]
+citoid: [eqiad, codfw]
+apertium: [eqiad, codfw]
+cxserver: [eqiad, codfw]
+ores: [eqiad, codfw]
+pdfrender: [eqiad, codfw]
+trendingedits: [eqiad, codfw]
+restbase: [eqiad, codfw]
+maps: [eqiad, codfw]
+aqs: [eqiad]
+eventbus: [eqiad, codfw]
+wdqs: [eqiad, codfw]
+logstash: [eqiad]
diff --git a/modules/profile/files/conftool/schema.yaml
b/modules/profile/files/conftool/schema.yaml
index 73ee72c..d2d3791 100644
--- a/modules/profile/files/conftool/schema.yaml
+++ b/modules/profile/files/conftool/schema.yaml
@@ -1,13 +1,14 @@
# Discovery objects. they will represent a sequence of cluster/service/dc
combinations
discovery:
path: "discovery"
- tags:
- - cluster
+ depends:
- service
+ tags:
+ - dnsdisc
schema:
pooled:
type: "bool"
default: false
- url:
- type: "string"
- default: ""
+ references:
+ type: "list"
+ default: []
--
To view, visit https://gerrit.wikimedia.org/r/340771
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0d90f164ad937a58b208514e2ec6ea2ccef8fd0a
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
