Gehel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337378 )

Change subject: elasticsearch - reimage to jessie and move data to /srv - 
preliminary work
......................................................................

elasticsearch - reimage to jessie and move data to /srv - preliminary work

This move data directory configuration to host specific hiera files (those
will be deleted priori to reimaging the hosts).

elastic1* nodes are configured to install on Jessie.

elastic1017-1031 have smaller disks, and are configure for RAID0 partitions,
the previous elasticseach-raid0.cfg partman config has been changed to mount
a data partition on /srv

elastic1032-1052 are now using the raid1-lvm-ext4-srv.cfg parman config.

The elasticsearch-raid1.cfg partman config isn't used anymore and has been
removed.

Bug: T151326
Bug: T151328
Change-Id: I76d0d1aeba02b1a3a8466ec7c912abb686041d95
---
M hieradata/hosts/elastic1017.yaml
A hieradata/hosts/elastic1018.yaml
A hieradata/hosts/elastic1019.yaml
A hieradata/hosts/elastic1020.yaml
A hieradata/hosts/elastic1021.yaml
A hieradata/hosts/elastic1022.yaml
A hieradata/hosts/elastic1023.yaml
A hieradata/hosts/elastic1024.yaml
A hieradata/hosts/elastic1025.yaml
A hieradata/hosts/elastic1026.yaml
A hieradata/hosts/elastic1027.yaml
A hieradata/hosts/elastic1028.yaml
A hieradata/hosts/elastic1029.yaml
M hieradata/hosts/elastic1030.yaml
A hieradata/hosts/elastic1031.yaml
A hieradata/hosts/elastic1032.yaml
A hieradata/hosts/elastic1033.yaml
A hieradata/hosts/elastic1034.yaml
A hieradata/hosts/elastic1035.yaml
M hieradata/hosts/elastic1036.yaml
A hieradata/hosts/elastic1037.yaml
A hieradata/hosts/elastic1038.yaml
A hieradata/hosts/elastic1039.yaml
M hieradata/hosts/elastic1040.yaml
A hieradata/hosts/elastic1041.yaml
A hieradata/hosts/elastic1042.yaml
A hieradata/hosts/elastic1043.yaml
A hieradata/hosts/elastic1044.yaml
A hieradata/hosts/elastic1045.yaml
A hieradata/hosts/elastic1046.yaml
A hieradata/hosts/elastic1047.yaml
M hieradata/role/eqiad/elasticsearch/cirrus.yaml
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/autoinstall/partman/elasticsearch-raid0.cfg
D modules/install_server/files/autoinstall/partman/elasticsearch-raid1.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
36 files changed, 100 insertions(+), 118 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/78/337378/1

diff --git a/hieradata/hosts/elastic1017.yaml b/hieradata/hosts/elastic1017.yaml
index 6cf24e8..7d55886 100644
--- a/hieradata/hosts/elastic1017.yaml
+++ b/hieradata/hosts/elastic1017.yaml
@@ -1,3 +1,7 @@
 debdeploy::grains:
   debdeploy-elastic:
     value: canary
+
+# temporarily override the default data directory, this will be removed when
+# server is reimaged with new data directory on /srv
+elasticsearch::data_dir: '/var/lib/elasticsearch'
diff --git a/hieradata/hosts/elastic1018.yaml b/hieradata/hosts/elastic1018.yaml
new file mode 100644
index 0000000..a764fc7
--- /dev/null
+++ b/hieradata/hosts/elastic1018.yaml
@@ -0,0 +1,3 @@
+# temporarily override the default data directory, this will be removed when
+# server is reimaged with new data directory on /srv
+elasticsearch::data_dir: '/var/lib/elasticsearch'
diff --git a/hieradata/hosts/elastic1019.yaml b/hieradata/hosts/elastic1019.yaml
new file mode 100644
index 0000000..a764fc7
--- /dev/null
+++ b/hieradata/hosts/elastic1019.yaml
@@ -0,0 +1,3 @@
+# temporarily override the default data directory, this will be removed when
+# server is reimaged with new data directory on /srv
+elasticsearch::data_dir: '/var/lib/elasticsearch'
diff --git a/hieradata/hosts/elastic1020.yaml b/hieradata/hosts/elastic1020.yaml
new file mode 100644
index 0000000..a764fc7
--- /dev/null
+++ b/hieradata/hosts/elastic1020.yaml
@@ -0,0 +1,3 @@
+# temporarily override the default data directory, this will be removed when
+# server is reimaged with new data directory on /srv
+elasticsearch::data_dir: '/var/lib/elasticsearch'
diff --git a/hieradata/hosts/elastic1021.yaml b/hieradata/hosts/elastic1021.yaml
new file mode 100644
index 0000000..a764fc7
--- /dev/null
+++ b/hieradata/hosts/elastic1021.yaml
@@ -0,0 +1,3 @@
+# temporarily override the default data directory, this will be removed when
+# server is reimaged with new data directory on /srv
+elasticsearch::data_dir: '/var/lib/elasticsearch'
diff --git a/hieradata/hosts/elastic1022.yaml b/hieradata/hosts/elastic1022.yaml
new file mode 100644
index 0000000..a764fc7
--- /dev/null
+++ b/hieradata/hosts/elastic1022.yaml
@@ -0,0 +1,3 @@
+# temporarily override the default data directory, this will be removed when
+# server is reimaged with new data directory on /srv
+elasticsearch::data_dir: '/var/lib/elasticsearch'
diff --git a/hieradata/hosts/elastic1023.yaml b/hieradata/hosts/elastic1023.yaml
new file mode 100644
index 0000000..a764fc7
--- /dev/null
+++ b/hieradata/hosts/elastic1023.yaml
@@ -0,0 +1,3 @@
+# temporarily override the default data directory, this will be removed when
+# server is reimaged with new data directory on /srv
+elasticsearch::data_dir: '/var/lib/elasticsearch'
diff --git a/hieradata/hosts/elastic1024.yaml b/hieradata/hosts/elastic1024.yaml
new file mode 100644
index 0000000..a764fc7
--- /dev/null
+++ b/hieradata/hosts/elastic1024.yaml
@@ -0,0 +1,3 @@
+# temporarily override the default data directory, this will be removed when
+# server is reimaged with new data directory on /srv
+elasticsearch::data_dir: '/var/lib/elasticsearch'
diff --git a/hieradata/hosts/elastic1025.yaml b/hieradata/hosts/elastic1025.yaml
new file mode 100644
index 0000000..a764fc7
--- /dev/null
+++ b/hieradata/hosts/elastic1025.yaml
@@ -0,0 +1,3 @@
+# temporarily override the default data directory, this will be removed when
+# server is reimaged with new data directory on /srv
+elasticsearch::data_dir: '/var/lib/elasticsearch'
diff --git a/hieradata/hosts/elastic1026.yaml b/hieradata/hosts/elastic1026.yaml
new file mode 100644
index 0000000..a764fc7
--- /dev/null
+++ b/hieradata/hosts/elastic1026.yaml
@@ -0,0 +1,3 @@
+# temporarily override the default data directory, this will be removed when
+# server is reimaged with new data directory on /srv
+elasticsearch::data_dir: '/var/lib/elasticsearch'
diff --git a/hieradata/hosts/elastic1027.yaml b/hieradata/hosts/elastic1027.yaml
new file mode 100644
index 0000000..a764fc7
--- /dev/null
+++ b/hieradata/hosts/elastic1027.yaml
@@ -0,0 +1,3 @@
+# temporarily override the default data directory, this will be removed when
+# server is reimaged with new data directory on /srv
+elasticsearch::data_dir: '/var/lib/elasticsearch'
diff --git a/hieradata/hosts/elastic1028.yaml b/hieradata/hosts/elastic1028.yaml
new file mode 100644
index 0000000..a764fc7
--- /dev/null
+++ b/hieradata/hosts/elastic1028.yaml
@@ -0,0 +1,3 @@
+# temporarily override the default data directory, this will be removed when
+# server is reimaged with new data directory on /srv
+elasticsearch::data_dir: '/var/lib/elasticsearch'
diff --git a/hieradata/hosts/elastic1029.yaml b/hieradata/hosts/elastic1029.yaml
new file mode 100644
index 0000000..a764fc7
--- /dev/null
+++ b/hieradata/hosts/elastic1029.yaml
@@ -0,0 +1,3 @@
+# temporarily override the default data directory, this will be removed when
+# server is reimaged with new data directory on /srv
+elasticsearch::data_dir: '/var/lib/elasticsearch'
diff --git a/hieradata/hosts/elastic1030.yaml b/hieradata/hosts/elastic1030.yaml
index 41eab79..b2eb046 100644
--- a/hieradata/hosts/elastic1030.yaml
+++ b/hieradata/hosts/elastic1030.yaml
@@ -1,3 +1,7 @@
 elasticsearch::master_eligible: true
 # make sure the elasticsearch::unicast_hosts property is updated if master
 # eligibility is modified
+
+# temporarily override the default data directory, this will be removed when
+# server is reimaged with new data directory on /srv
+elasticsearch::data_dir: '/var/lib/elasticsearch'
diff --git a/hieradata/hosts/elastic1031.yaml b/hieradata/hosts/elastic1031.yaml
new file mode 100644
index 0000000..a764fc7
--- /dev/null
+++ b/hieradata/hosts/elastic1031.yaml
@@ -0,0 +1,3 @@
+# temporarily override the default data directory, this will be removed when
+# server is reimaged with new data directory on /srv
+elasticsearch::data_dir: '/var/lib/elasticsearch'
diff --git a/hieradata/hosts/elastic1032.yaml b/hieradata/hosts/elastic1032.yaml
new file mode 100644
index 0000000..a764fc7
--- /dev/null
+++ b/hieradata/hosts/elastic1032.yaml
@@ -0,0 +1,3 @@
+# temporarily override the default data directory, this will be removed when
+# server is reimaged with new data directory on /srv
+elasticsearch::data_dir: '/var/lib/elasticsearch'
diff --git a/hieradata/hosts/elastic1033.yaml b/hieradata/hosts/elastic1033.yaml
new file mode 100644
index 0000000..a764fc7
--- /dev/null
+++ b/hieradata/hosts/elastic1033.yaml
@@ -0,0 +1,3 @@
+# temporarily override the default data directory, this will be removed when
+# server is reimaged with new data directory on /srv
+elasticsearch::data_dir: '/var/lib/elasticsearch'
diff --git a/hieradata/hosts/elastic1034.yaml b/hieradata/hosts/elastic1034.yaml
new file mode 100644
index 0000000..a764fc7
--- /dev/null
+++ b/hieradata/hosts/elastic1034.yaml
@@ -0,0 +1,3 @@
+# temporarily override the default data directory, this will be removed when
+# server is reimaged with new data directory on /srv
+elasticsearch::data_dir: '/var/lib/elasticsearch'
diff --git a/hieradata/hosts/elastic1035.yaml b/hieradata/hosts/elastic1035.yaml
new file mode 100644
index 0000000..a764fc7
--- /dev/null
+++ b/hieradata/hosts/elastic1035.yaml
@@ -0,0 +1,3 @@
+# temporarily override the default data directory, this will be removed when
+# server is reimaged with new data directory on /srv
+elasticsearch::data_dir: '/var/lib/elasticsearch'
diff --git a/hieradata/hosts/elastic1036.yaml b/hieradata/hosts/elastic1036.yaml
index 41eab79..b2eb046 100644
--- a/hieradata/hosts/elastic1036.yaml
+++ b/hieradata/hosts/elastic1036.yaml
@@ -1,3 +1,7 @@
 elasticsearch::master_eligible: true
 # make sure the elasticsearch::unicast_hosts property is updated if master
 # eligibility is modified
+
+# temporarily override the default data directory, this will be removed when
+# server is reimaged with new data directory on /srv
+elasticsearch::data_dir: '/var/lib/elasticsearch'
diff --git a/hieradata/hosts/elastic1037.yaml b/hieradata/hosts/elastic1037.yaml
new file mode 100644
index 0000000..a764fc7
--- /dev/null
+++ b/hieradata/hosts/elastic1037.yaml
@@ -0,0 +1,3 @@
+# temporarily override the default data directory, this will be removed when
+# server is reimaged with new data directory on /srv
+elasticsearch::data_dir: '/var/lib/elasticsearch'
diff --git a/hieradata/hosts/elastic1038.yaml b/hieradata/hosts/elastic1038.yaml
new file mode 100644
index 0000000..a764fc7
--- /dev/null
+++ b/hieradata/hosts/elastic1038.yaml
@@ -0,0 +1,3 @@
+# temporarily override the default data directory, this will be removed when
+# server is reimaged with new data directory on /srv
+elasticsearch::data_dir: '/var/lib/elasticsearch'
diff --git a/hieradata/hosts/elastic1039.yaml b/hieradata/hosts/elastic1039.yaml
new file mode 100644
index 0000000..a764fc7
--- /dev/null
+++ b/hieradata/hosts/elastic1039.yaml
@@ -0,0 +1,3 @@
+# temporarily override the default data directory, this will be removed when
+# server is reimaged with new data directory on /srv
+elasticsearch::data_dir: '/var/lib/elasticsearch'
diff --git a/hieradata/hosts/elastic1040.yaml b/hieradata/hosts/elastic1040.yaml
index 41eab79..b2eb046 100644
--- a/hieradata/hosts/elastic1040.yaml
+++ b/hieradata/hosts/elastic1040.yaml
@@ -1,3 +1,7 @@
 elasticsearch::master_eligible: true
 # make sure the elasticsearch::unicast_hosts property is updated if master
 # eligibility is modified
+
+# temporarily override the default data directory, this will be removed when
+# server is reimaged with new data directory on /srv
+elasticsearch::data_dir: '/var/lib/elasticsearch'
diff --git a/hieradata/hosts/elastic1041.yaml b/hieradata/hosts/elastic1041.yaml
new file mode 100644
index 0000000..a764fc7
--- /dev/null
+++ b/hieradata/hosts/elastic1041.yaml
@@ -0,0 +1,3 @@
+# temporarily override the default data directory, this will be removed when
+# server is reimaged with new data directory on /srv
+elasticsearch::data_dir: '/var/lib/elasticsearch'
diff --git a/hieradata/hosts/elastic1042.yaml b/hieradata/hosts/elastic1042.yaml
new file mode 100644
index 0000000..a764fc7
--- /dev/null
+++ b/hieradata/hosts/elastic1042.yaml
@@ -0,0 +1,3 @@
+# temporarily override the default data directory, this will be removed when
+# server is reimaged with new data directory on /srv
+elasticsearch::data_dir: '/var/lib/elasticsearch'
diff --git a/hieradata/hosts/elastic1043.yaml b/hieradata/hosts/elastic1043.yaml
new file mode 100644
index 0000000..a764fc7
--- /dev/null
+++ b/hieradata/hosts/elastic1043.yaml
@@ -0,0 +1,3 @@
+# temporarily override the default data directory, this will be removed when
+# server is reimaged with new data directory on /srv
+elasticsearch::data_dir: '/var/lib/elasticsearch'
diff --git a/hieradata/hosts/elastic1044.yaml b/hieradata/hosts/elastic1044.yaml
new file mode 100644
index 0000000..a764fc7
--- /dev/null
+++ b/hieradata/hosts/elastic1044.yaml
@@ -0,0 +1,3 @@
+# temporarily override the default data directory, this will be removed when
+# server is reimaged with new data directory on /srv
+elasticsearch::data_dir: '/var/lib/elasticsearch'
diff --git a/hieradata/hosts/elastic1045.yaml b/hieradata/hosts/elastic1045.yaml
new file mode 100644
index 0000000..a764fc7
--- /dev/null
+++ b/hieradata/hosts/elastic1045.yaml
@@ -0,0 +1,3 @@
+# temporarily override the default data directory, this will be removed when
+# server is reimaged with new data directory on /srv
+elasticsearch::data_dir: '/var/lib/elasticsearch'
diff --git a/hieradata/hosts/elastic1046.yaml b/hieradata/hosts/elastic1046.yaml
new file mode 100644
index 0000000..a764fc7
--- /dev/null
+++ b/hieradata/hosts/elastic1046.yaml
@@ -0,0 +1,3 @@
+# temporarily override the default data directory, this will be removed when
+# server is reimaged with new data directory on /srv
+elasticsearch::data_dir: '/var/lib/elasticsearch'
diff --git a/hieradata/hosts/elastic1047.yaml b/hieradata/hosts/elastic1047.yaml
new file mode 100644
index 0000000..a764fc7
--- /dev/null
+++ b/hieradata/hosts/elastic1047.yaml
@@ -0,0 +1,3 @@
+# temporarily override the default data directory, this will be removed when
+# server is reimaged with new data directory on /srv
+elasticsearch::data_dir: '/var/lib/elasticsearch'
diff --git a/hieradata/role/eqiad/elasticsearch/cirrus.yaml 
b/hieradata/role/eqiad/elasticsearch/cirrus.yaml
index 602aae2..43e1017 100644
--- a/hieradata/role/eqiad/elasticsearch/cirrus.yaml
+++ b/hieradata/role/eqiad/elasticsearch/cirrus.yaml
@@ -59,5 +59,3 @@
 
 elasticsearch::https::certificate_name: 'search.svc.eqiad.wmnet'
 profile::base::dns_alt_names:           'search.svc.eqiad.wmnet'
-
-elasticsearch::data_dir: '/var/lib/elasticsearch'
diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 83278fe..7b29d33 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -69,7 +69,7 @@
         druid100[123]) echo partman/druid-4ssd-raid10.cfg ;; \
         eeden|maerlant|multatuli|nescio) echo partman/raid1-1partition.cfg ;; \
         elastic101[7-9]|elastic102[0-9]|elastic103[0-1]) echo 
partman/elasticsearch-raid0.cfg ;; \
-        elastic103[2-9]|elastic104[0-9]|elastic105[0-2]) echo 
partman/elasticsearch-raid1.cfg ;; \
+        elastic103[2-9]|elastic104[0-9]|elastic105[0-2]) echo 
partman/raid1-lvm-ext4-srv.cfg ;; \
         elastic20[0-2][0-9]|elastic203[0-6]) echo 
partman/raid1-lvm-ext4-srv.cfg ;; \
         labmon1001|mwlog[12]001|relforge100[12]|scb200[1-4]) echo 
partman/raid10-gpt-srv-lvm-ext4.cfg ;; \
         analytics1003|cobalt|thorium) echo partman/raid10-gpt-srv-lvm-ext4.cfg 
;; \
diff --git 
a/modules/install_server/files/autoinstall/partman/elasticsearch-raid0.cfg 
b/modules/install_server/files/autoinstall/partman/elasticsearch-raid0.cfg
index 6c99bf5..8986fba 100644
--- a/modules/install_server/files/autoinstall/partman/elasticsearch-raid0.cfg
+++ b/modules/install_server/files/autoinstall/partman/elasticsearch-raid0.cfg
@@ -5,7 +5,7 @@
 # * layout:
 #   - /          : ext3, RAID1, 30GB
 #   - swap: RAID1, 1GB
-#   - /var/lib/elasticsearch: ext4, RAID0, rest of the space on both drives.
+#   - /srv: ext4, RAID0, rest of the space on both drives.
 #
 #   (This file was duplicated from raid1-30G.cfg.)
 
@@ -40,7 +40,7 @@
                1       2       0       swap    -       \
                        /dev/sda2#/dev/sdb2             \
                .                                       \
-               0       2       0       ext4    /var/lib/elasticsearch  \
+               0       2       0       ext4    /srv    \
                        /dev/sda3#/dev/sdb3             \
                .
 
diff --git 
a/modules/install_server/files/autoinstall/partman/elasticsearch-raid1.cfg 
b/modules/install_server/files/autoinstall/partman/elasticsearch-raid1.cfg
deleted file mode 100644
index 6290262..0000000
--- a/modules/install_server/files/autoinstall/partman/elasticsearch-raid1.cfg
+++ /dev/null
@@ -1,51 +0,0 @@
-# Automatic software RAID partitioning
-#
-# * two disks, sda & sdb
-# * primary partitions, no LVM
-# * layout:
-#   - /   : ext3, RAID1, 30GB
-#   - swap: RAID1, 1GB
-#   - /var/lib/elasticsearch: ext4, RAID1
-#
-
-d-i    partman-auto/method             string  raid
-d-i    partman-basicmethods/method_only        boolean false
-d-i    partman-md/device_remove_md     boolean true
-d-i    partman-lvm/device_remove_lvm   boolean true
-
-# Use the first two disks
-d-i    partman-auto/disk       string  /dev/sda /dev/sdb
-
-# Define physical partitions
-d-i    partman-auto/expert_recipe      string  \
-               multiraid ::    \
-                       5000    8000    30000   raid            \
-                               $primary{ } method{ raid }      \
-                       .                                       \
-                       1000    1000    1000    raid            \
-                               $primary{ } method{ raid }      \
-                       .                                       \
-                       1000    1000    -1      raid    \
-                               $primary{ } method{ keep }                      
\
-                       .
-
-# Parameters are:
-# <raidtype> <devcount> <sparecount> <fstype> <mountpoint> \
-#      <devices> <sparedevices>
-d-i    partman-auto-raid/recipe        string          \
-               1       2       0       ext3    /       \
-                       /dev/sda1#/dev/sdb1             \
-               .                                       \
-               1       2       0       swap    -       \
-                       /dev/sda2#/dev/sdb2             \
-               .                                       \
-               1       2       0       ext4    /var/lib/elasticsearch  \
-                       /dev/sda3#/dev/sdb3             \
-               .
-
-d-i    partman-md/confirm              boolean true
-d-i    partman-md/confirm_nooverwrite  boolean true
-d-i    partman/confirm_write_new_label boolean true
-d-i    partman/choose_partition        select  finish
-d-i    partman/confirm                 boolean true
-d-i    partman/confirm_nooverwrite     boolean true
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 b13b94d..d4135de 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1782,218 +1782,156 @@
 host elastic1017 {
     hardware ethernet B0:83:FE:C0:B0:D2;
     fixed-address elastic1017.eqiad.wmnet;
-    option pxelinux.pathprefix "trusty-installer/";
-    filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
 host elastic1018 {
     hardware ethernet B0:83:FE:BE:E6:93;
     fixed-address elastic1018.eqiad.wmnet;
-    option pxelinux.pathprefix "trusty-installer/";
-    filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
 host elastic1019 {
     hardware ethernet B0:83:FE:C0:9C:24;
     fixed-address elastic1019.eqiad.wmnet;
-    option pxelinux.pathprefix "trusty-installer/";
-    filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
 host elastic1020 {
     hardware ethernet B0:83:FE:C0:AE:DB;
     fixed-address elastic1020.eqiad.wmnet;
-    option pxelinux.pathprefix "trusty-installer/";
-    filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
 host elastic1021 {
     hardware ethernet B0:83:FE:C0:97:E8;
     fixed-address elastic1021.eqiad.wmnet;
-    option pxelinux.pathprefix "trusty-installer/";
-    filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
 host elastic1022 {
     hardware ethernet B0:83:FE:C0:B4:6F;
     fixed-address elastic1022.eqiad.wmnet;
-    option pxelinux.pathprefix "trusty-installer/";
-    filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
 host elastic1023 {
     hardware ethernet B0:83:FE:C0:BF:C7;
     fixed-address elastic1023.eqiad.wmnet;
-    option pxelinux.pathprefix "trusty-installer/";
-    filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
 host elastic1024 {
     hardware ethernet B0:83:FE:BE:F8:47;
     fixed-address elastic1024.eqiad.wmnet;
-    option pxelinux.pathprefix "trusty-installer/";
-    filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
 host elastic1025 {
     hardware ethernet B0:83:FE:BE:F8:17;
     fixed-address elastic1025.eqiad.wmnet;
-    option pxelinux.pathprefix "trusty-installer/";
-    filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
 host elastic1026 {
     hardware ethernet B0:83:FE:C0:B8:DB;
     fixed-address elastic1026.eqiad.wmnet;
-    option pxelinux.pathprefix "trusty-installer/";
-    filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
 host elastic1027 {
     hardware ethernet B0:83:FE:C0:99:44;
     fixed-address elastic1027.eqiad.wmnet;
-    option pxelinux.pathprefix "trusty-installer/";
-    filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
 host elastic1028 {
     hardware ethernet  B0:83:FE:C0:B3:EF;
     fixed-address elastic1028.eqiad.wmnet;
-    option pxelinux.pathprefix "trusty-installer/";
-    filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
 host elastic1029 {
     hardware ethernet B0:83:FE:BE:F9:0F;
     fixed-address elastic1029.eqiad.wmnet;
-    option pxelinux.pathprefix "trusty-installer/";
-    filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
 host elastic1030 {
     hardware ethernet B0:83:FE:BE:E5:87;
     fixed-address elastic1030.eqiad.wmnet;
-    option pxelinux.pathprefix "trusty-installer/";
-    filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
 host elastic1031 {
     hardware ethernet B0:83:FE:C0:A2:EF;
     fixed-address elastic1031.eqiad.wmnet;
-    option pxelinux.pathprefix "trusty-installer/";
-    filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
 host elastic1032 {
     hardware ethernet 14:02:EC:06:FE:54;
     fixed-address elastic1032.eqiad.wmnet;
-    option pxelinux.pathprefix "trusty-installer/";
-    filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
 host elastic1033 {
     hardware ethernet 14:02:EC:07:31:C4;
     fixed-address elastic1033.eqiad.wmnet;
-    option pxelinux.pathprefix "trusty-installer/";
-    filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
 host elastic1034 {
     hardware ethernet 14:02:EC:06:AE:70;
     fixed-address elastic1034.eqiad.wmnet;
-    option pxelinux.pathprefix "trusty-installer/";
-    filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
 host elastic1035 {
     hardware ethernet 14:02:EC:07:D3:F0;
     fixed-address elastic1035.eqiad.wmnet;
-    option pxelinux.pathprefix "trusty-installer/";
-    filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
 host elastic1036 {
     hardware ethernet 14:02:EC:06:AE:80;
     fixed-address elastic1036.eqiad.wmnet;
-    option pxelinux.pathprefix "trusty-installer/";
-    filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
 host elastic1037 {
     hardware ethernet 14:02:EC:06:DE:20;
     fixed-address elastic1037.eqiad.wmnet;
-    option pxelinux.pathprefix "trusty-installer/";
-    filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
 host elastic1038 {
     hardware ethernet 14:02:EC:06:9E:DC;
     fixed-address elastic1038.eqiad.wmnet;
-    option pxelinux.pathprefix "trusty-installer/";
-    filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
 host elastic1039 {
     hardware ethernet 14:02:EC:06:AE:3C;
     fixed-address elastic1039.eqiad.wmnet;
-    option pxelinux.pathprefix "trusty-installer/";
-    filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
 host elastic1040 {
     hardware ethernet 14:02:EC:06:BE:E4;
     fixed-address elastic1040.eqiad.wmnet;
-    option pxelinux.pathprefix "trusty-installer/";
-    filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
 host elastic1041 {
     hardware ethernet 14:02:EC:06:BE:18;
     fixed-address elastic1041.eqiad.wmnet;
-    option pxelinux.pathprefix "trusty-installer/";
-    filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
 host elastic1042 {
     hardware ethernet 14:02:EC:06:BE:6C;
     fixed-address elastic1042.eqiad.wmnet;
-    option pxelinux.pathprefix "trusty-installer/";
-    filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
 host elastic1043 {
     hardware ethernet 14:02:EC:07:D3:58;
     fixed-address elastic1043.eqiad.wmnet;
-    option pxelinux.pathprefix "trusty-installer/";
-    filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
 host elastic1044 {
     hardware ethernet 14:02:EC:07:E3:9C;
     fixed-address elastic1044.eqiad.wmnet;
-    option pxelinux.pathprefix "trusty-installer/";
-    filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
 host elastic1045 {
     hardware ethernet 14:02:EC:06:BE:14;
     fixed-address elastic1045.eqiad.wmnet;
-    option pxelinux.pathprefix "trusty-installer/";
-    filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
 host elastic1046 {
     hardware ethernet 14:02:EC:07:E3:F8;
     fixed-address elastic1046.eqiad.wmnet;
-    option pxelinux.pathprefix "trusty-installer/";
-    filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
 host elastic1047 {
     hardware ethernet 14:02:EC:07:D3:D4;
     fixed-address elastic1047.eqiad.wmnet;
-    option pxelinux.pathprefix "trusty-installer/";
-    filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
 host elastic1048 {

-- 
To view, visit https://gerrit.wikimedia.org/r/337378
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I76d0d1aeba02b1a3a8466ec7c912abb686041d95
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to