BBlack has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/341574 )
Change subject: add first discovery records + mock lint data
......................................................................
add first discovery records + mock lint data
Bug: T156100
Change-Id: Iee185342145f79f5cd115cdcb4f8c2a5f183392b
---
M config-geo-test
M templates/wmnet
2 files changed, 18 insertions(+), 0 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/config-geo-test b/config-geo-test
index a3ffac6..e336a43 100644
--- a/config-geo-test
+++ b/config-geo-test
@@ -2,9 +2,18 @@
geoip => {
maps => {
$include{geo-maps},
+ mock => { datacenters => mock }
},
resources => {
$include{geo-resources},
+ # mock active-active entries by copying here and changing name
+ disc-appservers-ro => { map => mock, dcmap => { mock => 192.0.2.1
} }
},
},
+ metafo => {
+ resources => {
+ # mock active-passive entries by copying here and changing name
+ disc-appservers-rw => { datacenters => mock, dcmap => { mock =>
192.0.2.1 } }
+ }
+ },
}
diff --git a/templates/wmnet b/templates/wmnet
index e2656a2..3284d44 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -4341,3 +4341,12 @@
ganeti01 1H IN A 10.192.16.131
labstore 1H IN A 10.192.21.7
oresrdb 5M IN A 10.192.16.31
+
+; DISCOVERY SERVICES
+
+; active-active use "geoip" plugin, active-passive use "metafo" for failoid
behavior.
+; resource name is "disc-foo", where "foo" is a key in discovery::services
hieradata.
+
+$ORIGIN discovery.wmnet.
+appservers-ro 5M IN DYNA geoip!disc-appservers-ro
+appservers-rw 5M IN DYNA metafo!disc-appservers-rw
--
To view, visit https://gerrit.wikimedia.org/r/341574
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iee185342145f79f5cd115cdcb4f8c2a5f183392b
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
