[MediaWiki-commits] [Gerrit] Labs: Minor fixes to labs_lvm::volume - change (operations/puppet)

2014-03-06 Thread coren (Code Review) 
coren has submitted this change and it was merged.

Change subject: Labs: Minor fixes to labs_lvm::volume
..


Labs: Minor fixes to labs_lvm::volume

Avoid /dev/mapper/ device names as it mangles
volume names containig dashes.

Change-Id: Ia044d4edfc0f56ce9c1fa27775e8e0e01c1bd28e
---
M modules/labs_lvm/manifests/volume.pp
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/modules/labs_lvm/manifests/volume.pp 
b/modules/labs_lvm/manifests/volume.pp
index 4217747..2a3f4f3 100644
--- a/modules/labs_lvm/manifests/volume.pp
+++ b/modules/labs_lvm/manifests/volume.pp
@@ -43,6 +43,7 @@
 }
 
 exec { create-vd-$volname:
+creates = /dev/vd/$volname,
 unless  = /sbin/lvdisplay -c vd/$volname,
 require = [
  File['/usr/local/sbin/make-instance-vol'],
@@ -58,7 +59,7 @@
 mount { $mountat:
 ensure  = mounted,
 atboot  = true,
-device  = /dev/mapper/vd-$volname,
+device  = /dev/vd/$volname,
 options = defaults,
 fstype  = $fstype,
 require = [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia044d4edfc0f56ce9c1fa27775e8e0e01c1bd28e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren mpellet...@wikimedia.org
Gerrit-Reviewer: coren mpellet...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Labs: Minor fixes to labs_lvm::volume - change (operations/puppet)

2014-03-06 Thread coren (Code Review) 
coren has uploaded a new change for review.

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

Change subject: Labs: Minor fixes to labs_lvm::volume
..

Labs: Minor fixes to labs_lvm::volume

Avoid /dev/mapper/ device names as it mangles
volume names containig dashes.

Change-Id: Ia044d4edfc0f56ce9c1fa27775e8e0e01c1bd28e
---
M modules/labs_lvm/manifests/volume.pp
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/00/117200/1

diff --git a/modules/labs_lvm/manifests/volume.pp 
b/modules/labs_lvm/manifests/volume.pp
index 4217747..2a3f4f3 100644
--- a/modules/labs_lvm/manifests/volume.pp
+++ b/modules/labs_lvm/manifests/volume.pp
@@ -43,6 +43,7 @@
 }
 
 exec { create-vd-$volname:
+creates = /dev/vd/$volname,
 unless  = /sbin/lvdisplay -c vd/$volname,
 require = [
  File['/usr/local/sbin/make-instance-vol'],
@@ -58,7 +59,7 @@
 mount { $mountat:
 ensure  = mounted,
 atboot  = true,
-device  = /dev/mapper/vd-$volname,
+device  = /dev/vd/$volname,
 options = defaults,
 fstype  = $fstype,
 require = [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia044d4edfc0f56ce9c1fa27775e8e0e01c1bd28e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren mpellet...@wikimedia.org

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