Andrew Bogott has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/350239 )
Change subject: Switch labservices1002 to the primary designate/dns server. ...................................................................... Switch labservices1002 to the primary designate/dns server. Bug: https://phabricator.wikimedia.org/T163402 Change-Id: I36b44e85559e9d28f0949b6aa57999ec8c3e0294 --- M hieradata/codfw.yaml M hieradata/common.yaml M hieradata/eqiad.yaml A hieradata/hosts/labservices1001.yaml M hieradata/labs.yaml M manifests/site.pp 6 files changed, 25 insertions(+), 17 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/codfw.yaml b/hieradata/codfw.yaml index 079f800..6c85f1e 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: "labservices1001.wikimedia.org" +labs_certmanager_hostname: "labservices1002.wikimedia.org" # These are the up-and-coming, better dns servers: labsdnsconfig: - host: 'labs-ns0.wikimedia.org' - host_secondary: 'labs-ns1.wikimedia.org' + host: 'labs-ns1.wikimedia.org' + host_secondary: 'labs-ns0.wikimedia.org' dbserver: 'm5-master.eqiad.wmnet' - recursor: 'labs-recursor0.wikimedia.org' - recursor_secondary: 'labs-recursor1.wikimedia.org' + recursor: 'labs-recursor1.wikimedia.org' + recursor_secondary: 'labs-recursor0.wikimedia.org' labsldapconfig: hostname: ldap-labs.codfw.wikimedia.org diff --git a/hieradata/common.yaml b/hieradata/common.yaml index 15e7c1d..a199b02 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 "labservices1001.wikimedia.org" -labs_designate_hostname_secondary: &labs_designate_hostname_secondary "labservices1002.wikimedia.org" +labs_designate_hostname: &labsdesignatehostname "labservices1002.wikimedia.org" +labs_designate_hostname_secondary: &labs_designate_hostname_secondary "labservices1001.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 608b2af..84549e8 100644 --- a/hieradata/eqiad.yaml +++ b/hieradata/eqiad.yaml @@ -62,7 +62,7 @@ # - mysql-m4-master-03 -labs_certmanager_hostname: "labservices1001.wikimedia.org" +labs_certmanager_hostname: "labservices1002.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-ns0.wikimedia.org' - host_secondary: 'labs-ns1.wikimedia.org' + host: 'labs-ns1.wikimedia.org' + host_secondary: 'labs-ns0.wikimedia.org' dbserver: 'localhost' - recursor: 'labs-recursor0.wikimedia.org' - recursor_secondary: 'labs-recursor1.wikimedia.org' + recursor: 'labs-recursor1.wikimedia.org' + recursor_secondary: 'labs-recursor0.wikimedia.org' novaconfig: db_host: 'm5-master.eqiad.wmnet' diff --git a/hieradata/hosts/labservices1001.yaml b/hieradata/hosts/labservices1001.yaml new file mode 100644 index 0000000..e16cf34 --- /dev/null +++ b/hieradata/hosts/labservices1001.yaml @@ -0,0 +1,5 @@ +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 0c946f5..2eb6b5e 100644 --- a/hieradata/labs.yaml +++ b/hieradata/labs.yaml @@ -14,8 +14,8 @@ # dns labsdnsconfig: - recursor: 'labs-recursor0.wikimedia.org' - recursor_secondary: 'labs-recursor1.wikimedia.org' + recursor: 'labs-recursor1.wikimedia.org' + recursor_secondary: 'labs-recursor0.wikimedia.org' # Additional base overrides standard::has_admin: false diff --git a/manifests/site.pp b/manifests/site.pp index bd595b0..cabc461 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1151,8 +1151,9 @@ role(mw_rc_irc) } -# labservices1001 hosts openstack-designate, the labs DNS service. -node 'labservices1001.wikimedia.org' { +# labservices1002 hosts openstack-designate, the labs DNS service, +# as well as the labs dns service. +node 'labservices1002.wikimedia.org' { role(labs::dns, labs::openstack::designate::server, labs::dnsrecursor, labs::dns_floating_ip_updater) include ::standard @@ -1160,7 +1161,9 @@ include ::ldap::role::client::labs } -node 'labservices1002.wikimedia.org' { +# labservices1001 hosts the secondary labs dns service and +# is a manual fail-over option for designate. +node 'labservices1001.wikimedia.org' { role(labs::dns, labs::openstack::designate::server, labs::dnsrecursor) include ::standard include ::base::firewall -- To view, visit https://gerrit.wikimedia.org/r/350239 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I36b44e85559e9d28f0949b6aa57999ec8c3e0294 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott <[email protected]> Gerrit-Reviewer: Andrew Bogott <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
