BryanDavis has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/402086 )
Change subject: wikireplica_dns: Add s8 shard
......................................................................
wikireplica_dns: Add s8 shard
* Add validation and IP addresses for the new s8 shard.
* Add guard against missing dblists
Bug: T184179
Change-Id: I633b01e98e82fd7ebe57b90ab42e40d5e7075c62
---
M modules/openstack/files/util/wikireplica_dns.py
M modules/openstack/files/util/wikireplica_dns.yaml
2 files changed, 15 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/86/402086/1
diff --git a/modules/openstack/files/util/wikireplica_dns.py
b/modules/openstack/files/util/wikireplica_dns.py
index e17fd29..fb0585b 100644
--- a/modules/openstack/files/util/wikireplica_dns.py
+++ b/modules/openstack/files/util/wikireplica_dns.py
@@ -221,7 +221,7 @@
else:
zones = all_zones
- all_shards = ['s1', 's2', 's3', 's4', 's5', 's6', 's7']
+ all_shards = ['s1', 's2', 's3', 's4', 's5', 's6', 's7', 's8']
if args.shard:
if args.shard not in all_shards:
parser.error(
@@ -250,12 +250,16 @@
# Ensure that there are wikidb aliases for shards
dblist = requests.get(
'https://noc.wikimedia.org/conf/{}.dblist'.format(svc))
- dblist.raise_for_status()
- for wikidb in dblist.text.splitlines():
- db_fqdn = '{}.{}'.format(wikidb, zone)
- dns.ensure_recordset(zone_id, db_fqdn, 'CNAME', [fqdn])
- # Take a small break to be nicer to Designate
- time.sleep(0.25)
+ try:
+ dblist.raise_for_status()
+ except requests.exceptions.HTTPError:
+ logger.warning('DBList "%s" not found', svc)
+ else:
+ for wikidb in dblist.text.splitlines():
+ db_fqdn = '{}.{}'.format(wikidb, zone)
+ dns.ensure_recordset(zone_id, db_fqdn, 'CNAME', [fqdn])
+ # Take a small break to be nicer to Designate
+ time.sleep(0.25)
if svc in config['cnames']:
# Add additional aliases for this shard
diff --git a/modules/openstack/files/util/wikireplica_dns.yaml
b/modules/openstack/files/util/wikireplica_dns.yaml
index 0258e4d..8ec501a 100644
--- a/modules/openstack/files/util/wikireplica_dns.yaml
+++ b/modules/openstack/files/util/wikireplica_dns.yaml
@@ -35,6 +35,8 @@
- 10.64.37.14
s7:
- 10.64.37.14
+ s8:
+ - 10.64.37.14
web.db.svc.eqiad.wmflabs.:
s1:
- 10.64.37.15
@@ -50,6 +52,8 @@
- 10.64.37.15
s7:
- 10.64.37.15
+ s8:
+ - 10.64.37.15
cnames:
s7:
- centralauth
--
To view, visit https://gerrit.wikimedia.org/r/402086
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I633b01e98e82fd7ebe57b90ab42e40d5e7075c62
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
