[MediaWiki-commits] [Gerrit] ms-be2 new mac addr, new disk layout (720xd), remove dup stanza - change (operations/puppet)

[ArielGlenn (Code Review)]

ArielGlenn has submitted this change and it was merged.

Change subject: ms-be2 new mac addr, new disk layout (720xd), remove dup stanza
......................................................................


ms-be2 new mac addr, new disk layout (720xd), remove dup stanza

Change-Id: I4c5a61feddc947c93af433f4b655e3aa61760de7
---
M files/autoinstall/netboot.cfg
M files/dhcpd/linux-host-entries.ttyS1-115200
M manifests/site.pp
3 files changed, 5 insertions(+), 17 deletions(-)

Approvals:
  ArielGlenn: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/files/autoinstall/netboot.cfg b/files/autoinstall/netboot.cfg
index 2204274..d6dfae0 100755
--- a/files/autoinstall/netboot.cfg
+++ b/files/autoinstall/netboot.cfg
@@ -47,8 +47,8 @@
                mobile100[0-9]) echo partman/mw.cfg ;; \
                ms[1-3]) echo partman/raid1-1partition-thumper.cfg ;; \
                ms-fe[1-4]) echo partman/raid1-1partition.cfg ;; \
-               ms-be[1-2]|ms-be4) echo partman/ms-be.cfg ;; \
-               ms-be3|ms-be[5-9]|ms-be1[0-2]) echo partman/ms-be-ssd.cfg ;; \
+               ms-be1|ms-be4) echo partman/ms-be.cfg ;; \
+               ms-be[2-3]|ms-be[5-9]|ms-be1[0-2]) echo partman/ms-be-ssd.cfg 
;; \
                ms-be30[0-9][0-9]) echo partman/raid1-varnish.cfg ;; \
                ms-fe100[1-4]) echo partman/raid1-1partition.cfg ;; \
                ms-be10[0-9][0-9]) echo partman/ceph-ssd.cfg ;; \
diff --git a/files/dhcpd/linux-host-entries.ttyS1-115200 
b/files/dhcpd/linux-host-entries.ttyS1-115200
index fb03ca8..e837193 100644
--- a/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1500,7 +1500,7 @@
 }
 
 host ms-be2 {
-       hardware ethernet E8:9A:8F:D3:3E:44;
+       hardware ethernet 90:B1:1C:18:A6:32;
        fixed-address ms-be2.pmtpa.wmnet;
 }
 
diff --git a/manifests/site.pp b/manifests/site.pp
index 0ab6fbd..eadc668 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1776,7 +1776,7 @@
        include role::swift::pmtpa-prod::proxy
 }
 
-node /^ms-be(1|2|4|13)\.pmtpa\.wmnet$/ {
+node /^ms-be(1|4)\.pmtpa\.wmnet$/ {
        $all_drives = [ '/dev/sdc', '/dev/sdd', '/dev/sde',
                '/dev/sdf', '/dev/sdg', '/dev/sdh', '/dev/sdi', '/dev/sdj', 
'/dev/sdk',
                '/dev/sdl' ]
@@ -1803,7 +1803,7 @@
        swift::mount_filesystem{ '/dev/sdn3': }
 }
 
-node /^ms-be(9|11|12)\.pmtpa\.wmnet$/ {
+node /^ms-be(2|9|11|12)\.pmtpa\.wmnet$/ {
        # the ms-be hosts with ssds have two more disks
        # this is the 720xds with h710 layout
        $all_drives = [ '/dev/sdc', '/dev/sdd', '/dev/sde',
@@ -1818,18 +1818,6 @@
        swift::label_filesystem{ '/dev/sdb3': }
        swift::mount_filesystem{ '/dev/sda3': }
        swift::mount_filesystem{ '/dev/sdb3': }
-}
-
-node /^ms-be(1|2|4)\.pmtpa\.wmnet$/ {
-       # the ms-be hosts with ssds have two more disks
-       # these are the c2100s, to be gone soon
-       $all_drives = [ '/dev/sdc', '/dev/sdd', '/dev/sde',
-               '/dev/sdf', '/dev/sdg', '/dev/sdh', '/dev/sdi', '/dev/sdj', 
'/dev/sdk',
-               '/dev/sdl', '/dev/sdm', '/dev/sdn' ]
-
-       include role::swift::pmtpa-prod::storage
-
-       swift::create_filesystem{ $all_drives: partition_nr => "1" }
 }
 
 node /^ms-fe100[1-4]\.eqiad\.wmnet$/ {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4c5a61feddc947c93af433f4b655e3aa61760de7
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <ar...@wikimedia.org>
Gerrit-Reviewer: ArielGlenn <ar...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits