Hello jenkins-bot,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/350250
to review the following change.
Change subject: Revert "Switch labservices1002 to the primary designate/dns
server."
......................................................................
Revert "Switch labservices1002 to the primary designate/dns server."
This reverts commit fe74bc04f05aad90419300a495e677c24bfb46ea.
Change-Id: I3cffb6a14600524775a7a31c5576bc0ddda5289e
---
M hieradata/codfw.yaml
M hieradata/common.yaml
M hieradata/eqiad.yaml
D hieradata/hosts/labservices1001.yaml
M hieradata/labs.yaml
M manifests/site.pp
6 files changed, 17 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/50/350250/1
diff --git a/hieradata/codfw.yaml b/hieradata/codfw.yaml
index 6c85f1e..079f800 100644
--- a/hieradata/codfw.yaml
+++ b/hieradata/codfw.yaml
@@ -33,15 +33,15 @@
labs_glance_controller: "labcontrol1001.wikimedia.org"
labs_puppet_master: "labs-puppetmaster-eqiad.wikimedia.org"
labs_keystone_host: "labcontrol1001.wikimedia.org"
-labs_certmanager_hostname: "labservices1002.wikimedia.org"
+labs_certmanager_hostname: "labservices1001.wikimedia.org"
# These are the up-and-coming, better dns servers:
labsdnsconfig:
- host: 'labs-ns1.wikimedia.org'
- host_secondary: 'labs-ns0.wikimedia.org'
+ host: 'labs-ns0.wikimedia.org'
+ host_secondary: 'labs-ns1.wikimedia.org'
dbserver: 'm5-master.eqiad.wmnet'
- recursor: 'labs-recursor1.wikimedia.org'
- recursor_secondary: 'labs-recursor0.wikimedia.org'
+ recursor: 'labs-recursor0.wikimedia.org'
+ recursor_secondary: 'labs-recursor1.wikimedia.org'
labsldapconfig:
hostname: ldap-labs.codfw.wikimedia.org
diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index a199b02..15e7c1d 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -315,8 +315,8 @@
labs_tld: "wmflabs"
labs_private_ips_reverse_dns: "68.10.in-addr.arpa"
-labs_designate_hostname: &labsdesignatehostname "labservices1002.wikimedia.org"
-labs_designate_hostname_secondary: &labs_designate_hostname_secondary
"labservices1001.wikimedia.org"
+labs_designate_hostname: &labsdesignatehostname "labservices1001.wikimedia.org"
+labs_designate_hostname_secondary: &labs_designate_hostname_secondary
"labservices1002.wikimedia.org"
labs_nova_api_host: &labsnovaapihost "labnet1001.eqiad.wmnet"
labs_nova_network_host: &labsnovanetworkhost "labnet1001"
labs_nova_network_ip: &labsnovanetworkip "10.64.20.25"
diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml
index 84549e8..608b2af 100644
--- a/hieradata/eqiad.yaml
+++ b/hieradata/eqiad.yaml
@@ -62,7 +62,7 @@
# - mysql-m4-master-03
-labs_certmanager_hostname: "labservices1002.wikimedia.org"
+labs_certmanager_hostname: "labservices1001.wikimedia.org"
# Default zookeeper cluster to use in eqiad.
# The cluster config is in common.yaml in zookeeper_clusters.
@@ -93,11 +93,11 @@
# These are the up-and-coming, better dns servers:
labsdnsconfig:
- host: 'labs-ns1.wikimedia.org'
- host_secondary: 'labs-ns0.wikimedia.org'
+ host: 'labs-ns0.wikimedia.org'
+ host_secondary: 'labs-ns1.wikimedia.org'
dbserver: 'localhost'
- recursor: 'labs-recursor1.wikimedia.org'
- recursor_secondary: 'labs-recursor0.wikimedia.org'
+ recursor: 'labs-recursor0.wikimedia.org'
+ recursor_secondary: 'labs-recursor1.wikimedia.org'
novaconfig:
db_host: 'm5-master.eqiad.wmnet'
diff --git a/hieradata/hosts/labservices1001.yaml
b/hieradata/hosts/labservices1001.yaml
deleted file mode 100644
index e16cf34..0000000
--- a/hieradata/hosts/labservices1001.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-labsdnsconfig:
- host: 'labs-ns0.wikimedia.org'
- host_secondary: 'labs-ns1.wikimedia.org'
- recursor: 'labs-recursor0.wikimedia.org'
- recursor_secondary: 'labs-recursor1.wikimedia.org'
diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index 2eb6b5e..0c946f5 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -14,8 +14,8 @@
# dns
labsdnsconfig:
- recursor: 'labs-recursor1.wikimedia.org'
- recursor_secondary: 'labs-recursor0.wikimedia.org'
+ recursor: 'labs-recursor0.wikimedia.org'
+ recursor_secondary: 'labs-recursor1.wikimedia.org'
# Additional base overrides
standard::has_admin: false
diff --git a/manifests/site.pp b/manifests/site.pp
index cabc461..bd595b0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1151,9 +1151,8 @@
role(mw_rc_irc)
}
-# labservices1002 hosts openstack-designate, the labs DNS service,
-# as well as the labs dns service.
-node 'labservices1002.wikimedia.org' {
+# labservices1001 hosts openstack-designate, the labs DNS service.
+node 'labservices1001.wikimedia.org' {
role(labs::dns, labs::openstack::designate::server, labs::dnsrecursor,
labs::dns_floating_ip_updater)
include ::standard
@@ -1161,9 +1160,7 @@
include ::ldap::role::client::labs
}
-# labservices1001 hosts the secondary labs dns service and
-# is a manual fail-over option for designate.
-node 'labservices1001.wikimedia.org' {
+node 'labservices1002.wikimedia.org' {
role(labs::dns, labs::openstack::designate::server, labs::dnsrecursor)
include ::standard
include ::base::firewall
--
To view, visit https://gerrit.wikimedia.org/r/350250
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3cffb6a14600524775a7a31c5576bc0ddda5289e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
