Jcrespo has submitted this change and it was merged.
Change subject: Removing references to pnds database on s5
......................................................................
Removing references to pnds database on s5
Bug: T128737
Change-Id: I2a1652f434520790094f9d80fc3c10de82a7a45c
---
M hieradata/codfw/labtest.yaml
M hieradata/eqiad.yaml
M templates/mariadb/dumps-misc.sh.erb
M templates/mariadb/production-grants-m5.sql.erb
4 files changed, 2 insertions(+), 68 deletions(-)
Approvals:
Jcrespo: Verified; Looks good to me, approved
Andrew Bogott: Looks good to me, but someone else must approve
diff --git a/hieradata/codfw/labtest.yaml b/hieradata/codfw/labtest.yaml
index 5add0f6..bc548f3 100644
--- a/hieradata/codfw/labtest.yaml
+++ b/hieradata/codfw/labtest.yaml
@@ -103,7 +103,6 @@
db_host: 'labtestcontrol2001.wikimedia.org'
db_name: 'designate'
pool_manager_db_name: 'designate_pool_manager'
- pdns_db_host: 'labtestcontrol2001.wikimedia.org'
dhcp_domain: 'labtestcodfw'
pdns_db_name: 'pdns'
rabbit_host: *labsnovacontroller
diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml
index d3d72b5..a667305 100644
--- a/hieradata/eqiad.yaml
+++ b/hieradata/eqiad.yaml
@@ -143,7 +143,6 @@
db_host: 'm5-master.eqiad.wmnet'
db_name: 'designate'
pool_manager_db_name: 'designate_pool_manager'
- pdns_db_host: 'm5-master.eqiad.wmnet'
dhcp_domain: 'eqiad'
pdns_db_name: 'pdns'
rabbit_host: *labsnovacontroller
diff --git a/templates/mariadb/dumps-misc.sh.erb
b/templates/mariadb/dumps-misc.sh.erb
index 72d9aef..1f092e3 100644
--- a/templates/mariadb/dumps-misc.sh.erb
+++ b/templates/mariadb/dumps-misc.sh.erb
@@ -23,8 +23,8 @@
--databases $($my "$sql" | tr '\n' ' ') | \
pigz > /srv/backups/m3-phabricator-phlegal-$(date +%Y%m%d%H%M%S).sql.gz
-$dump_master -h m5-slave --databases ceilometer glance keystone neutron nova \
- pdns designate designate_pool_manager nodepooldb | \
+$dump_slave -h m5-slave --databases ceilometer glance keystone neutron nova \
+ designate designate_pool_manager nodepooldb | \
pigz > /srv/backups/m5-$(date +%Y%m%d%H%M%S).sql.gz &
sql="select schema_name from information_schema.schemata where schema_name
regexp '^(wik|flowdb)'"
diff --git a/templates/mariadb/production-grants-m5.sql.erb
b/templates/mariadb/production-grants-m5.sql.erb
index 5607203..06cea8f 100644
--- a/templates/mariadb/production-grants-m5.sql.erb
+++ b/templates/mariadb/production-grants-m5.sql.erb
@@ -1,36 +1,6 @@
-- haproxy
CREATE USER 'haproxy'@'10.64.16.155';
--- pdns, holmium
-
-CREATE USER 'pdns_admin'@'10.64.16.155'
-IDENTIFIED BY PASSWORD '*17CEDD01A991E1E7C9734790D2BE399610E76F7F';
-
-GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER,
- CREATE TEMPORARY TABLES
-ON `pdns`.* TO 'pdns_admin'@'10.64.16.155';
-
-CREATE USER 'pdns'@'10.64.16.155'
-IDENTIFIED BY PASSWORD '*D59E93D5BA8096F6A23E82C4F2B4AF7F6F33C1B6';
-
-GRANT SELECT, INSERT, UPDATE, DELETE, CREATE TEMPORARY TABLES
-ON `pdns`.* TO 'pdns'@'10.64.16.155';
-
--- pdns, labservices1001
-
-CREATE USER 'pdns_admin'@'10.64.16.155'
-IDENTIFIED BY PASSWORD '*17CEDD01A991E1E7C9734790D2BE399610E76F7F';
-
-GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER,
- CREATE TEMPORARY TABLES
-ON `pdns`.* TO 'pdns_admin'@'10.64.16.155';
-
-CREATE USER 'pdns'@'10.64.16.155'
-IDENTIFIED BY PASSWORD '*D59E93D5BA8096F6A23E82C4F2B4AF7F6F33C1B6';
-
-GRANT SELECT, INSERT, UPDATE, DELETE, CREATE TEMPORARY TABLES
-ON `pdns`.* TO 'pdns'@'10.64.16.155';
-
-- designate, holmium
CREATE USER 'designate'@'10.64.16.155'
@@ -98,40 +68,6 @@
ON `testreduce_0715`.* TO 'ssastry'@'10.64.16.155';
GRANT SELECT, INSERT, UPDATE, DELETE, ALTER
ON `testreduce_vd`.* TO 'ssastry'@'10.64.16.155';
-
--- ------------------------
--- deleteme after failover:
--- ------------------------
-
--- pdns, holmium
-
-CREATE USER 'pdns_admin'@'208.80.154.12'
-IDENTIFIED BY PASSWORD '*17CEDD01A991E1E7C9734790D2BE399610E76F7F';
-
-GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER,
- CREATE TEMPORARY TABLES
-ON `pdns`.* TO 'pdns_admin'@'208.80.154.12';
-
-CREATE USER 'pdns'@'208.80.154.12'
-IDENTIFIED BY PASSWORD '*D59E93D5BA8096F6A23E82C4F2B4AF7F6F33C1B6';
-
-GRANT SELECT, INSERT, UPDATE, DELETE, CREATE TEMPORARY TABLES
-ON `pdns`.* TO 'pdns'@'208.80.154.12';
-
--- pdns, labservices1001
-
-CREATE USER 'pdns_admin'@'208.80.155.117'
-IDENTIFIED BY PASSWORD '*17CEDD01A991E1E7C9734790D2BE399610E76F7F';
-
-GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER,
- CREATE TEMPORARY TABLES
-ON `pdns`.* TO 'pdns_admin'@'208.80.155.117';
-
-CREATE USER 'pdns'@'208.80.155.117'
-IDENTIFIED BY PASSWORD '*D59E93D5BA8096F6A23E82C4F2B4AF7F6F33C1B6';
-
-GRANT SELECT, INSERT, UPDATE, DELETE, CREATE TEMPORARY TABLES
-ON `pdns`.* TO 'pdns'@'208.80.155.117';
-- designate, holmium
--
To view, visit https://gerrit.wikimedia.org/r/287922
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2a1652f434520790094f9d80fc3c10de82a7a45c
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Jcrespo <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
