Akosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/93082
Change subject: palladium/strontium as puppetmasters
......................................................................
palladium/strontium as puppetmasters
Palladium will be the frontend and strontium a backend. palladium will
effectively be taking sockpuppet's place in all respects (e.g. puppetCA,
puppet-merge runner etc). One last step to be done after the transition
is to move the puppet MySQL database to db1001
Change-Id: Id6e38ae4c60f0ea2f91ecb0aab6c4f2b4720e198
---
M files/autoinstall/netboot.cfg
M files/dhcpd/linux-host-entries.ttyS1-115200
M files/dsh/group/ALL
M files/dsh/group/misc_eqiad
M manifests/site.pp
5 files changed, 67 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/82/93082/1
diff --git a/files/autoinstall/netboot.cfg b/files/autoinstall/netboot.cfg
index 07e5f58..ce0cc6d 100755
--- a/files/autoinstall/netboot.cfg
+++ b/files/autoinstall/netboot.cfg
@@ -43,7 +43,7 @@
calcium|helium|potassium|tmh1001|tmh1002) echo
partman/raid1-1partition.cfg ;; \
capella) echo partman/lvs.cfg ;; \
cp102[1-9]|cp10[3-6][0-9]|cp1070|cp[34]0[0-9][0-9]|sq6[7-9]|sq70|dysprosium)
echo partman/raid1-varnish.cfg ;; \
-
antimony|arsenic|barium|celsus|erbium|gadolinium|holmium|magnesium|neodymium|promethium|rubidium|terbium|wtp100[1-4])
echo partman/lvm.cfg ;; \
+
antimony|arsenic|barium|celsus|erbium|gadolinium|holmium|magnesium|neodymium|palladium|promethium|rubidium|strontium|terbium|wtp100[1-4])
echo partman/lvm.cfg ;; \
kuo|lardner|mexia|tola) echo partman/lvm.cfg ;; \
lvs[1-6]|lvs100*) echo partman/lvs.cfg ;; \
lvs400*) echo partman/raid1-lvm.cfg ;; \
diff --git a/files/dhcpd/linux-host-entries.ttyS1-115200
b/files/dhcpd/linux-host-entries.ttyS1-115200
index bdefd3f..4ce40da 100644
--- a/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -3741,6 +3741,11 @@
fixed-address oxygen.wikimedia.org;
}
+host palladium {
+ hardware ethernet 18:03:73:f1:59:2d;
+ fixed-address palladium.eqiad.wmnet;
+}
+
host pappas {
hardware ethernet 90:b1:1c:13:3d:22;
fixed-address pappas.wikimedia.org;
@@ -4606,6 +4611,11 @@
fixed-address stat1002.eqiad.wmnet;
}
+host strontium {
+ hardware ethernet 18:03:73:f4:ef:51;
+ fixed-address strontium.eqiad.wmnet;
+}
+
host tellurium {
hardware ethernet 00:10:18:E4:1E:26;
fixed-address tellurium.eqiad.wmnet;
diff --git a/files/dsh/group/ALL b/files/dsh/group/ALL
index 4959d2d..94a6488 100644
--- a/files/dsh/group/ALL
+++ b/files/dsh/group/ALL
@@ -15,6 +15,8 @@
db9
db10
db29
+palladium
+strontium
searchidx1001
search1001
diff --git a/files/dsh/group/misc_eqiad b/files/dsh/group/misc_eqiad
index 9654b16..d8d6657 100644
--- a/files/dsh/group/misc_eqiad
+++ b/files/dsh/group/misc_eqiad
@@ -28,12 +28,14 @@
nitrogen
oxygen
potassium
+palladium
praseodymium
promethium
rubidium
ruthenium
silver
sodium
+strontium
terbium
tin
vanadium
diff --git a/manifests/site.pp b/manifests/site.pp
index a7e001e..86760db 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2174,6 +2174,34 @@
include role::logging::udp2log::lucene
}
+node 'palladium.eqiad.wmnet' {
+ include passwords::puppet::database
+
+ include standard,
+ backup::client,
+ misc::management::ipmi,
+ role::salt::masters::production,
+ role::deployment::salt_masters::production
+
+ class { puppetmaster:
+ allow_from => [
+ '*.wikimedia.org',
+ '*.pmtpa.wmnet',
+ '*.eqiad.wmnet',
+ '*.ulsfo.wmnet',
+ ],
+ server_type => 'frontend',
+ workers => ['palladium.eqiad.wmnet', 'strontium.eqiad.wmnet'],
+ config => {
+ 'thin_storeconfigs' => true,
+ 'dbadapter' => 'mysql',
+ 'dbuser' => 'puppet',
+ 'dbpassword' =>
$passwords::puppet::database::puppet_production_db_pass,
+ 'dbserver' => 'db9.pmtpa.wmnet' #TODO: Migrate to db1001
+ }
+ }
+}
+
node /pc([1-3]\.pmtpa|100[1-3]\.eqiad)\.wmnet/ {
include role::db::core,
mysql_wmf::mysqluser,
@@ -2553,6 +2581,30 @@
}
}
+node 'strontium.eqiad.wmnet' {
+ include standard,
+ passwords::puppet::database
+
+ class { puppetmaster:
+ allow_from => [
+ '*.wikimedia.org',
+ '*.pmtpa.wmnet',
+ '*.eqiad.wmnet',
+ '*.ulsfo.wmnet',
+ ],
+ server_type => 'backend',
+ config => {
+ 'thin_storeconfigs' => true,
+ 'ca' => 'false',
+ 'ca_server' => 'palladium.eqiad.wmnet',
+ 'dbadapter' => 'mysql',
+ 'dbuser' => 'puppet',
+ 'dbpassword' =>
$passwords::puppet::database::puppet_production_db_pass,
+ 'dbserver' => 'db9.pmtpa.wmnet', #TODO: Move to db1001
+ 'dbconnections' => '256',
+ }
+ }
+}
node "stat1.wikimedia.org" {
include role::statistics::cruncher
--
To view, visit https://gerrit.wikimedia.org/r/93082
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id6e38ae4c60f0ea2f91ecb0aab6c4f2b4720e198
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Akosiaris <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
