Gehel has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/333592 )
Change subject: elasticsearch - configure new servers in codfw
......................................................................
elasticsearch - configure new servers in codfw
* update conftool-data to add new servers to LVS
* update list of servers to include new nodes (this will update ferm rules)
* use Ubuntu instead of Jessie (we are not yet ready to migrate to Debian)
Bug: T154251
Change-Id: Icf45e2f7ae0fd31bb37e6c750220a89e000a0df4
---
M conftool-data/nodes/codfw.yaml
M hieradata/role/codfw/elasticsearch/cirrus.yaml
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
3 files changed, 49 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
DCausse: Looks good to me, but someone else must approve
Gehel: Looks good to me, approved
diff --git a/conftool-data/nodes/codfw.yaml b/conftool-data/nodes/codfw.yaml
index bb5d79b..3d731ed 100644
--- a/conftool-data/nodes/codfw.yaml
+++ b/conftool-data/nodes/codfw.yaml
@@ -238,6 +238,18 @@
elastic2022.codfw.wmnet: [elasticsearch, elasticsearch-ssl]
elastic2023.codfw.wmnet: [elasticsearch, elasticsearch-ssl]
elastic2024.codfw.wmnet: [elasticsearch, elasticsearch-ssl]
+ elastic2025.codfw.wmnet: [elasticsearch, elasticsearch-ssl]
+ elastic2026.codfw.wmnet: [elasticsearch, elasticsearch-ssl]
+ elastic2027.codfw.wmnet: [elasticsearch, elasticsearch-ssl]
+ elastic2028.codfw.wmnet: [elasticsearch, elasticsearch-ssl]
+ elastic2029.codfw.wmnet: [elasticsearch, elasticsearch-ssl]
+ elastic2030.codfw.wmnet: [elasticsearch, elasticsearch-ssl]
+ elastic2031.codfw.wmnet: [elasticsearch, elasticsearch-ssl]
+ elastic2032.codfw.wmnet: [elasticsearch, elasticsearch-ssl]
+ elastic2033.codfw.wmnet: [elasticsearch, elasticsearch-ssl]
+ elastic2034.codfw.wmnet: [elasticsearch, elasticsearch-ssl]
+ elastic2035.codfw.wmnet: [elasticsearch, elasticsearch-ssl]
+ elastic2036.codfw.wmnet: [elasticsearch, elasticsearch-ssl]
restbase:
restbase2001.codfw.wmnet: [restbase]
restbase2002.codfw.wmnet: [restbase]
diff --git a/hieradata/role/codfw/elasticsearch/cirrus.yaml
b/hieradata/role/codfw/elasticsearch/cirrus.yaml
index 7f2a263..0f7c867 100644
--- a/hieradata/role/codfw/elasticsearch/cirrus.yaml
+++ b/hieradata/role/codfw/elasticsearch/cirrus.yaml
@@ -34,8 +34,20 @@
- elastic2022.codfw.wmnet
- elastic2023.codfw.wmnet
- elastic2024.codfw.wmnet
+ - elastic2025.codfw.wmnet
+ - elastic2026.codfw.wmnet
+ - elastic2027.codfw.wmnet
+ - elastic2028.codfw.wmnet
+ - elastic2029.codfw.wmnet
+ - elastic2030.codfw.wmnet
+ - elastic2031.codfw.wmnet
+ - elastic2032.codfw.wmnet
+ - elastic2033.codfw.wmnet
+ - elastic2034.codfw.wmnet
+ - elastic2035.codfw.wmnet
+ - elastic2036.codfw.wmnet
-elasticsearch::expected_nodes: 24
+elasticsearch::expected_nodes: 36
# We should be able to run "OK" with 11 servers.
elasticsearch::recover_after_nodes: 11
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 04197e7..247bb68 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -2304,61 +2304,85 @@
host elastic2025 {
hardware ethernet 94:18:82:6f:08:f4;
fixed-address elastic2025.codfw.wmnet;
+ option pxelinux.pathprefix "trusty-installer/";
+ filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
}
host elastic2026 {
hardware ethernet 94:18:82:6f:28:b8;
fixed-address elastic2026.codfw.wmnet;
+ option pxelinux.pathprefix "trusty-installer/";
+ filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
}
host elastic2027 {
hardware ethernet 94:18:82:6f:28:10;
fixed-address elastic2027.codfw.wmnet;
+ option pxelinux.pathprefix "trusty-installer/";
+ filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
}
host elastic2028 {
hardware ethernet 94:18:82:6f:08:b8;
fixed-address elastic2028.codfw.wmnet;
+ option pxelinux.pathprefix "trusty-installer/";
+ filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
}
host elastic2029 {
hardware ethernet 94:18:82:6f:18:44;
fixed-address elastic2029.codfw.wmnet;
+ option pxelinux.pathprefix "trusty-installer/";
+ filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
}
host elastic2030 {
hardware ethernet 94:18:82:6f:08:fc;
fixed-address elastic2030.codfw.wmnet;
+ option pxelinux.pathprefix "trusty-installer/";
+ filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
}
host elastic2031 {
hardware ethernet 94:18:82:6f:38:28;
fixed-address elastic2031.codfw.wmnet;
+ option pxelinux.pathprefix "trusty-installer/";
+ filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
}
host elastic2032 {
hardware ethernet 94:18:82:6f:18:f4;
fixed-address elastic2032.codfw.wmnet;
+ option pxelinux.pathprefix "trusty-installer/";
+ filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
}
host elastic2033 {
hardware ethernet 94:18:82:6f:18:1c;
fixed-address elastic2033.codfw.wmnet;
+ option pxelinux.pathprefix "trusty-installer/";
+ filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
}
host elastic2034 {
hardware ethernet 94:18:82:6f:08:e4;
fixed-address elastic2034.codfw.wmnet;
+ option pxelinux.pathprefix "trusty-installer/";
+ filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
}
host elastic2035 {
hardware ethernet 94:18:82:69:bc:d0;
fixed-address elastic2035.codfw.wmnet;
+ option pxelinux.pathprefix "trusty-installer/";
+ filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
}
host elastic2036 {
hardware ethernet 94:18:82:6f:18:34;
fixed-address elastic2036.codfw.wmnet;
+ option pxelinux.pathprefix "trusty-installer/";
+ filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
}
host es1011 {
--
To view, visit https://gerrit.wikimedia.org/r/333592
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icf45e2f7ae0fd31bb37e6c750220a89e000a0df4
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel <[email protected]>
Gerrit-Reviewer: DCausse <[email protected]>
Gerrit-Reviewer: Gehel <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
