coren has submitted this change and it was merged. Change subject: Labs: Some tweaks and saner defaults for labs LVM ......................................................................
Labs: Some tweaks and saner defaults for labs LVM Change-Id: Ie288c2f88a863bc5febdbd79d1a4b04f967f0b2b --- M modules/labs_lvm/manifests/init.pp M modules/labs_lvm/manifests/volume.pp 2 files changed, 6 insertions(+), 6 deletions(-) Approvals: coren: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/labs_lvm/manifests/init.pp b/modules/labs_lvm/manifests/init.pp index 02b9782..a9faffc 100644 --- a/modules/labs_lvm/manifests/init.pp +++ b/modules/labs_lvm/manifests/init.pp @@ -10,7 +10,7 @@ # unallocated segment of the disk) # -class labs_lvm($disk) { +class labs_lvm($disk = '/dev/vda') { package { 'lvm2': ensure => present, @@ -26,7 +26,7 @@ } exec { 'create-volume-group': - onlyif => "/bin/bash -c '! /sbin/vgdisplay -c vd'", + unless => '/sbin/vgdisplay -c vd', require => File['/usr/local/sbin/make-instance-vg'], command => "/usr/local/sbin/make-instance-vg '$disk'", } diff --git a/modules/labs_lvm/manifests/volume.pp b/modules/labs_lvm/manifests/volume.pp index 7393eb8..4217747 100644 --- a/modules/labs_lvm/manifests/volume.pp +++ b/modules/labs_lvm/manifests/volume.pp @@ -27,7 +27,7 @@ define labs_lvm::volume( $volname = $title, - $mountat = "/mnt/$volume", + $mountat = "/mnt/$volname", $size = '100%FREE', $fstype = 'ext4', $mkfs_opt = '' @@ -43,7 +43,7 @@ } exec { "create-vd-$volname": - onlyif => "/bin/bash -c '! /sbin/lvdisplay -c vd/$volname'", + unless => "/sbin/lvdisplay -c vd/$volname", require => [ File['/usr/local/sbin/make-instance-vol'], Exec['create-volume-group'] @@ -57,9 +57,9 @@ mount { $mountat: ensure => mounted, - atboot => false, + atboot => true, device => "/dev/mapper/vd-$volname", - options => "defaults,noauto", + options => "defaults", fstype => $fstype, require => [ Exec["create-vd-$volname"], -- To view, visit https://gerrit.wikimedia.org/r/116050 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie288c2f88a863bc5febdbd79d1a4b04f967f0b2b Gerrit-PatchSet: 2 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