Merge pull request #20 from rightscale-cookbooks/white_14_07_acu11293…

…9_ephemeral_set_fstab_to_nopass

Set pass in /etc/fstab entry to 0.

.kitchen.yml

@@ -7,15 +7,15 @@ platforms:
 - name: ubuntu-12.04
   driver_config:
     box: opscode-ubuntu-12.04
-    box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_provisionerless.box
+    box_url: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.04_chef-provisionerless.box
 - name: ubuntu-10.04
   driver_config:
     box: opscode-ubuntu-10.04
-    box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_provisionerless.box
-- name: centos-6.4
+    box_url: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-10.04_chef-provisionerless.box
+- name: centos-6.5
   driver_config:
-    box: opscode-centos-6.4
-    box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.4_provisionerless.box
+    box: opscode-centos-6.5
+    box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.5_chef-provisionerless.box
 - name: centos-5.9
   driver_config:
     box: opscode-centos-5.9

recipes/default.rb

@@ -46,7 +46,7 @@
       logical_volume node['ephemeral_lvm']['logical_volume_name'] do
         size node['ephemeral_lvm']['logical_volume_size']
         filesystem node['ephemeral_lvm']['filesystem']
-        mount_point location: node['ephemeral_lvm']['mount_point'], options: ['defaults', 'noauto']
+        mount_point location: node['ephemeral_lvm']['mount_point'], options: ['defaults', 'noauto'], pass: 0
         if ephemeral_devices.size > 1
           stripes ephemeral_devices.size
           stripe_size node['ephemeral_lvm']['stripe_size'].to_i

test/integration/default/bats/verify_ephemeral.bats

@@ -28,5 +28,5 @@ export PATH=$PATH:/sbin:/usr/sbin
 @test "ephemeral logical volume is mounted to /mnt/ephemeral" {
   mountpoint /mnt/ephemeral
   mount | grep "/dev/mapper/vg--data-ephemeral0 on /mnt/ephemeral type ext3"
-  grep -P "/dev/mapper/vg--data-ephemeral0\s+/mnt/ephemeral\s+ext3\s+defaults,noauto\s" /etc/fstab
+  grep -P "/dev/mapper/vg--data-ephemeral0\s+/mnt/ephemeral\s+ext3\s+defaults,noauto\s+0\s+0" /etc/fstab
 }

test/integration/gce/bats/verify_ephemeral.bats

@@ -22,7 +22,6 @@ export PATH=$PATH:/sbin:/usr/sbin
   lvs | grep vg-data | grep ephemeral0
 }
 
-
 # The `lvs --segments --separator :` command outputs in the following format
 # 'LV:VG:Attr:#Str:Type:SSize' where '#Str' is the number of stripes and 'Type' is 'striped'
 # if the LVM is striped and 'linear' otherwise.
@@ -34,5 +33,5 @@ export PATH=$PATH:/sbin:/usr/sbin
 @test "ephemeral logical volume is mounted to /mnt/ephemeral" {
   mountpoint /mnt/ephemeral
   mount | grep "/dev/mapper/vg--data-ephemeral0 on /mnt/ephemeral type ext3"
-  grep -P "/dev/mapper/vg--data-ephemeral0\s+/mnt/ephemeral\s+ext3\s+defaults,noauto\s" /etc/fstab
+  grep -P "/dev/mapper/vg--data-ephemeral0\s+/mnt/ephemeral\s+ext3\s+defaults,noauto\s+0\s+0" /etc/fstab
 }