Merge pull request #49 from rightscale-cookbooks/attached-disk-is-null

fixes new drive structure on ephemeral drives

CHANGELOG.md

@@ -3,6 +3,11 @@ ephemeral_lvm Cookbook CHANGELOG
 
 This file is used to list changes made in each version of the ephemeral_lvm cookbook.
 
+v1.0.16
+-------
+
+- updated helper library to node['gce']['instance'] instead of node['gce']['attached_disks']
+
 v1.0.15
 -------
 

Gemfile

@@ -3,6 +3,9 @@ source 'https://rubygems.org'
 gem 'berkshelf'
 gem 'thor-foodcritic'
 gem 'thor-scmversion'
+gem 'rack', '= 1.6.4'
+gem 'json', '~> 1.8', '>= 1.8.3'
+gem 'buff-ignore', '~> 1.1.1'
 
 group :integration do
   gem 'test-kitchen', '~> 1.2.1'

libraries/helper.rb

@@ -66,7 +66,14 @@ def self.get_ephemeral_devices(cloud, node)
             if disk['type'] == "EPHEMERAL" && disk['deviceName'].match(/^local-ssd-\d+$/)
               "/dev/disk/by-id/google-#{disk["deviceName"]}"
             end
-          end
+          end unless node[cloud]['attached_disks'].nil?
+
+          ephemeral_devices = node[cloud]['instance']['disks'].map do |disk|
+            if disk['type'] == "LOCAL-SSD" && disk['deviceName'].match(/^local-ssd-\d+$/)
+              "/dev/disk/by-id/google-#{disk["deviceName"]}"
+            end
+          end unless node[cloud]['instance'].nil?
+
           # Removes nil elements from the ephemeral_devices array if any.
           ephemeral_devices.compact!
         else

metadata.rb

@@ -4,7 +4,7 @@
 license          'Apache 2.0'
 description      'Configures available ephemeral devices on a cloud server'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '1.0.15'
+version          '1.0.16'
 
 supports 'ubuntu'
 supports 'centos'