BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/161355
Change subject: Add cp1008.wm.o to puppet
......................................................................
Add cp1008.wm.o to puppet
WMF3127
Temporary host for SSL SNI testing,
formerly cp008.eqiad.wmnet.
Change-Id: Ia10a22ac1fc9b6d2acd46f1404e6519126eb8a74
---
M manifests/site.pp
M modules/install-server/files/autoinstall/netboot.cfg
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
3 files changed, 19 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/55/161355/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 7b5b4d4..a7c6b1a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -487,6 +487,15 @@
}
}
+# cp1008: temporary test host for SNI SSL
+node 'cp1008.eqiad.wikimedia.org' {
+ include admin
+ interface::add_ip6_mapped { 'main': }
+ $cluster = 'cache_text'
+ include role::cache::text
+ include role::cache::ssl::sni
+}
+
node /^cp10(3[7-9]|40)\.eqiad\.wmnet$/ {
include admin
if $::hostname =~ /^cp103[78]$/ {
diff --git a/modules/install-server/files/autoinstall/netboot.cfg
b/modules/install-server/files/autoinstall/netboot.cfg
index bee83f1..ad9c032 100755
--- a/modules/install-server/files/autoinstall/netboot.cfg
+++ b/modules/install-server/files/autoinstall/netboot.cfg
@@ -55,6 +55,7 @@
calcium|helium|potassium|tmh1001|tmh1002) echo
partman/raid1-1partition.cfg ;; \
acamar|achernar|baham|cobalt|lead|polonium) echo
partman/raid1-lvm.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 ;; \
+ cp1008) echo partman/raid1-varnish.cfg ;; \
antimony|arsenic|caesium|erbium|gadolinium|holmium|magnesium|neodymium|palladium|promethium|rubidium|strontium|terbium|wtp100[1-4])
echo partman/lvm.cfg ;; \
mexia) echo partman/lvm.cfg ;; \
lvs[1-6]|lvs[12]00*) echo partman/lvs.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 fc268c8..6851139 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -428,6 +428,15 @@
fixed-address copper.eqiad.wmnet;
}
+host cp1008 {
+ # temp test box for SNI
+ # precise for more-exact test against current live cache setup
+ hardware ethernet 84:2b:2b:fd:bd:05;
+ fixed-address cp1008.wikimedia.org;
+ option pxelinux.pathprefix "precise-installer/";
+ filename "precise-installer/ubuntu-installer/amd64/pxelinux.0";
+}
+
host cp1037 {
hardware ethernet 84:2b:2b:fd:bf:2a;
fixed-address cp1037.eqiad.wmnet;
--
To view, visit https://gerrit.wikimedia.org/r/161355
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia10a22ac1fc9b6d2acd46f1404e6519126eb8a74
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
