Rush has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/392087 )
Change subject: openstack: labsaliases extra records move to module/profile/role
......................................................................
openstack: labsaliases extra records move to module/profile/role
Bug: T171494
Change-Id: I702781639d524221038527f47a6606bc9f570a18
---
R hieradata/common/profile/openstack/base/pdns/recursor.yaml
M modules/profile/manifests/openstack/base/pdns/recursor/service.pp
2 files changed, 4 insertions(+), 2 deletions(-)
Approvals:
Rush: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/common/dnsrecursor/labsaliaser.yaml
b/hieradata/common/profile/openstack/base/pdns/recursor.yaml
similarity index 85%
rename from hieradata/common/dnsrecursor/labsaliaser.yaml
rename to hieradata/common/profile/openstack/base/pdns/recursor.yaml
index 6fc06be..812f839 100644
--- a/hieradata/common/dnsrecursor/labsaliaser.yaml
+++ b/hieradata/common/profile/openstack/base/pdns/recursor.yaml
@@ -1,7 +1,7 @@
# Extra records that the Labs DNS resolver should respond to.
# Used for things that would ideally be in a .svc. DNS zone but
# we do not have one. REMEMBER THE TRAILING DOT.
-dnsrecursor::labsaliaser::extra_records:
+profile::openstack::base::pdns::recursor::aliaser_extra_records:
tools-db.tools.eqiad.wmflabs.: 10.64.37.9 # labsdb1005.eqiad.wmnet / tools-db
tools-redis.tools.eqiad.wmflabs.: 10.68.22.56 #
tools-redis-1001.tools.eqiad.wmflabs
- tools-redis.eqiad.wmflabs.: 10.68.22.56 #
tools-redis-1001.tools.eqiad.wmflabs
\ No newline at end of file
+ tools-redis.eqiad.wmflabs.: 10.68.22.56 #
tools-redis-1001.tools.eqiad.wmflabs
diff --git a/modules/profile/manifests/openstack/base/pdns/recursor/service.pp
b/modules/profile/manifests/openstack/base/pdns/recursor/service.pp
index d80d55c..7e66951 100644
--- a/modules/profile/manifests/openstack/base/pdns/recursor/service.pp
+++ b/modules/profile/manifests/openstack/base/pdns/recursor/service.pp
@@ -29,6 +29,7 @@
$c1_dbs = hiera('profile::openstack::base::pdns::labsdb::c1'),
$c2_dbs = hiera('profile::openstack::base::pdns::labsdb::c2'),
$c3_dbs = hiera('profile::openstack::base::pdns::labsdb::c3'),
+ $aliaser_extra_records =
hiera('profile::openstack::base::pdns::recursor::aliaser_extra_records'),
) {
include ::network::constants
@@ -79,6 +80,7 @@
username => $observer_user,
password => $observer_password,
nova_api_url => "http://${nova_controller}:35357/v3";,
+ extra_records => $aliaser_extra_records,
alias_file => $alias_file,
observer_project_name => $observer_project,
}
--
To view, visit https://gerrit.wikimedia.org/r/392087
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I702781639d524221038527f47a6606bc9f570a18
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <r...@wikimedia.org>
Gerrit-Reviewer: Rush <r...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
