[MediaWiki-commits] [Gerrit] ms-be9 to correct stanza with new disk layout - change (operations/puppet)

2013-04-24 Thread ArielGlenn (Code Review) 
ArielGlenn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/60652


Change subject: ms-be9 to correct stanza with new disk layout
..

ms-be9 to correct stanza with new disk layout

Change-Id: If3291a80f031b78d826691ac334686574712ab7a
---
M manifests/site.pp
1 file changed, 2 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/52/60652/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 931760e..7732aa6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1784,17 +1784,6 @@
swift::create_filesystem{ $all_drives: partition_nr = 1 }
 }
 
-node /^ms-be9\.pmtpa\.wmnet$/ {
-   # the ms-be hosts with ssds have two more disks
-   $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-be(3|[5-8]|10)\.pmtpa\.wmnet$/ {
# the ms-be hosts that are 720xds with ssds have two more disks
# but with the h310s they show up as m and n, those get the OS
@@ -1812,7 +1801,7 @@
swift::mount_filesystem{ '/dev/sdn3': }
 }
 
-node /^ms-be(11|12)\.pmtpa\.wmnet$/ {
+node /^ms-be(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',
@@ -1829,7 +1818,7 @@
swift::mount_filesystem{ '/dev/sdb3': }
 }
 
-node /^ms-be(1|2|4|9)\.pmtpa\.wmnet$/ {
+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',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If3291a80f031b78d826691ac334686574712ab7a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn ar...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] ms-be9 to correct stanza with new disk layout - change (operations/puppet)

2013-04-24 Thread ArielGlenn (Code Review) 
ArielGlenn has submitted this change and it was merged.

Change subject: ms-be9 to correct stanza with new disk layout
..


ms-be9 to correct stanza with new disk layout

Change-Id: If3291a80f031b78d826691ac334686574712ab7a
---
M manifests/site.pp
1 file changed, 2 insertions(+), 13 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 931760e..7732aa6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1784,17 +1784,6 @@
swift::create_filesystem{ $all_drives: partition_nr = 1 }
 }
 
-node /^ms-be9\.pmtpa\.wmnet$/ {
-   # the ms-be hosts with ssds have two more disks
-   $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-be(3|[5-8]|10)\.pmtpa\.wmnet$/ {
# the ms-be hosts that are 720xds with ssds have two more disks
# but with the h310s they show up as m and n, those get the OS
@@ -1812,7 +1801,7 @@
swift::mount_filesystem{ '/dev/sdn3': }
 }
 
-node /^ms-be(11|12)\.pmtpa\.wmnet$/ {
+node /^ms-be(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',
@@ -1829,7 +1818,7 @@
swift::mount_filesystem{ '/dev/sdb3': }
 }
 
-node /^ms-be(1|2|4|9)\.pmtpa\.wmnet$/ {
+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',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If3291a80f031b78d826691ac334686574712ab7a
Gerrit-PatchSet: 1
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