Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/215608
Change subject: site: Set up radon (move to public, jessie)
......................................................................
site: Set up radon (move to public, jessie)
(also cleanup some old MySQL GRANTs from its previous allocation)
Unallocated/has no purpose, for now.
Change-Id: If94209359bea4fb946e69a7d130650cd6b2ba927
---
M manifests/site.pp
M modules/install-server/files/autoinstall/netboot.cfg
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
M templates/mariadb/production-grants-m3.sql.erb
4 files changed, 9 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/08/215608/1
diff --git a/manifests/site.pp b/manifests/site.pp
index d8f3f8b..b9cd5c4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2129,6 +2129,10 @@
}
}
+node 'radon.wikimedia.org' {
+ include standard
+}
+
# Live Recent Changes WebSocket stream
node 'rcs1001.eqiad.wmnet', 'rcs1002.eqiad.wmnet' {
interface::add_ip6_mapped { 'main':
diff --git a/modules/install-server/files/autoinstall/netboot.cfg
b/modules/install-server/files/autoinstall/netboot.cfg
index cbfe3b2..c10a48d 100755
--- a/modules/install-server/files/autoinstall/netboot.cfg
+++ b/modules/install-server/files/autoinstall/netboot.cfg
@@ -54,7 +54,7 @@
bast*) echo partman/lvm.cfg ;; \
boron|chromium|hydrogen) echo partman/lvm.cfg ;; \
calcium|helium|potassium|tmh1001|tmh1002) echo
partman/raid1-1partition.cfg ;; \
-
acamar|achernar|baham|cobalt|lead|lithium|polonium|rubidium|rhodium) echo
partman/raid1-lvm.cfg ;; \
+
acamar|achernar|baham|cobalt|lead|lithium|polonium|radon|rubidium|rhodium) echo
partman/raid1-lvm.cfg ;; \
cp1008|cp104[34]|cp300[3-9]|cp301[0-9]|cp302[0-2]) echo
partman/varnish-oldssd.cfg ;; \
cp[1234][0-9][0-9][0-9]) echo partman/varnish.cfg ;; \
d-i-test) echo partman/flat.cfg ;; \
@@ -84,7 +84,7 @@
labsdb100[67]) echo partman/raid5-gpt-lvm.cfg ;; \
bast2001|berkelium|californium|curium|dbproxy10[0-1][0-9]|holmium|install2001|iridium)
echo partman/raid1.cfg ;; \
eventlog[1-2]001|labcontrol2001|ocg100[1-3]|sca100[1-2]) echo
partman/raid1.cfg ;; \
-
nembus|neptunium|nickel|plutonium|pollux|protactinium|radium|radon|silver|uranium)
echo partman/raid1.cfg ;; \
+
nembus|neptunium|nickel|plutonium|pollux|protactinium|radium|silver|uranium)
echo partman/raid1.cfg ;; \
rhenium) echo partman/raid1-gpt.cfg ;; \
francium) echo partman/raid10-gpt.cfg ;; \
osm-cp*) echo partman/mw.cfg ;; \
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
index 149a020..8f38eb4 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -5379,7 +5379,9 @@
host radon {
hardware ethernet C8:1F:66:BF:71:16;
- fixed-address radon.eqiad.wmnet;
+ fixed-address radon.wikimedia.org;
+ option pxelinux.pathprefix "jessie-installer/";
+ filename "jessie-installer/debian-installer/amd64/pxelinux.0";
}
host rdb2001 {
diff --git a/templates/mariadb/production-grants-m3.sql.erb
b/templates/mariadb/production-grants-m3.sql.erb
index 25e7b0d..0e8a4c5 100644
--- a/templates/mariadb/production-grants-m3.sql.erb
+++ b/templates/mariadb/production-grants-m3.sql.erb
@@ -4,24 +4,6 @@
GRANT USAGE
ON *.* TO 'haproxy'@'10.64.0.198';
--- phadmin@radon
-
-GRANT USAGE
- ON *.* TO 'phadmin'@'10.64.32.149'
- IDENTIFIED BY PASSWORD '*4882BF5FB61F6C0D5935BFA407BB6B6086421A5F';
-
-GRANT ALL PRIVILEGES
- ON `phlegal%`.* TO 'phadmin'@'10.64.32.149';
-
--- phuser@radon
-
-GRANT USAGE
- ON *.* TO 'phuser'@'10.64.32.149'
- IDENTIFIED BY PASSWORD '*986DF0EF210E895FAAA2D71A8AF0F4EEA4D93E2A';
-
-GRANT DELETE, EXECUTE, INSERT, SELECT, SHOW VIEW, UPDATE
- ON `phlegal%`.* TO 'phuser'@'10.64.32.149';
-
-- phadmin@iridium
GRANT USAGE
--
To view, visit https://gerrit.wikimedia.org/r/215608
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If94209359bea4fb946e69a7d130650cd6b2ba927
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
