Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/312115
Change subject: designate-sink nova_ldap: set l to the correct site
......................................................................
designate-sink nova_ldap: set l to the correct site
Change-Id: I0bafa472de9c74b7eb4ff55952366e3c74c5b944
---
M modules/openstack/files/liberty/designate/nova_ldap/base.py
M modules/openstack/files/liberty/designate/nova_ldap/novaldap.py
M modules/openstack/templates/kilo/designate/designate.conf.erb
M modules/openstack/templates/liberty/designate/designate.conf.erb
4 files changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/15/312115/1
diff --git a/modules/openstack/files/liberty/designate/nova_ldap/base.py
b/modules/openstack/files/liberty/designate/nova_ldap/base.py
index 036fd5a..a50f4d4 100644
--- a/modules/openstack/files/liberty/designate/nova_ldap/base.py
+++ b/modules/openstack/files/liberty/designate/nova_ldap/base.py
@@ -142,7 +142,7 @@
'domain',
'dcobject',
'top']
- hostEntry['l'] = 'eqiad'
+ hostEntry['l'] = cfg.CONF[self.name].site
hostEntry['dc'] = dc
hostEntry['aRecord'] = addr['address'].encode('utf8')
hostEntry['puppetClass'] = []
diff --git a/modules/openstack/files/liberty/designate/nova_ldap/novaldap.py
b/modules/openstack/files/liberty/designate/nova_ldap/novaldap.py
index 3f7a2b8..d4aea83 100644
--- a/modules/openstack/files/liberty/designate/nova_ldap/novaldap.py
+++ b/modules/openstack/files/liberty/designate/nova_ldap/novaldap.py
@@ -32,6 +32,7 @@
cfg.ListOpt('notification-topics', default=['monitor']),
cfg.StrOpt('control-exchange', default='nova'),
cfg.StrOpt('domain_id', default=None),
+ cfg.StrOpt('site', default='eqiad'),
cfg.ListOpt('format', default=[]),
cfg.StrOpt('ldapusername', default=None),
diff --git a/modules/openstack/templates/kilo/designate/designate.conf.erb
b/modules/openstack/templates/kilo/designate/designate.conf.erb
index 00b93c0..f97c0b0 100644
--- a/modules/openstack/templates/kilo/designate/designate.conf.erb
+++ b/modules/openstack/templates/kilo/designate/designate.conf.erb
@@ -284,6 +284,7 @@
[handler:nova_ldap]
# Domain ID of domain to create records in. For a pre-existing domain, in this
case eqiad.wmflabs
domain_id = '<%= @designateconfig["domain_id_internal_forward"] %>'
+site = '<%= @site %>'
notification_topics = monitor
notification_topics = notifications
control_exchange = nova
diff --git a/modules/openstack/templates/liberty/designate/designate.conf.erb
b/modules/openstack/templates/liberty/designate/designate.conf.erb
index 129de03..9de3988 100644
--- a/modules/openstack/templates/liberty/designate/designate.conf.erb
+++ b/modules/openstack/templates/liberty/designate/designate.conf.erb
@@ -283,6 +283,7 @@
[handler:nova_fixed_multi]
# Domain ID of domain to create records in. For a pre-existing domain, in this
case eqiad.wmflabs
domain_id = '<%= @designateconfig["domain_id_internal_forward"] %>'
+site = '<%= @site %>'
notification_topics = monitor
notification_topics = notifications
control_exchange = nova
--
To view, visit https://gerrit.wikimedia.org/r/312115
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0bafa472de9c74b7eb4ff55952366e3c74c5b944
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk <a...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
