Merge pull request #14 from rightscale-cookbooks/st_14_16_acu182511_s…

…kip_root_vol_on_cloudstack_backup Skip root vol on cloudstack backup
rightscale-cookbooks · Nov 12, 2014 · d7dd3de · d7dd3de
2 parents 8601163 + e05199f
commit d7dd3de
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,10 +5,5 @@ rvm:
 before_script: bundle exec berks install
 script: bundle exec strainer test --except kitchen
 notifications:
-  irc:
-    channels:
-    - chat.freenode.net#rightscale
-    use_notice: true
-    skip_join: true
   slack:
     secure: D1rDJwkwTuhM4Sf9OMunfcps77V6rFJ6rmBewNOKNz1N1G72iv4gNJEHnsMmbZ8B7qBvtlBySsJkRzEBrWhTkEw4UqjYXsiMX0qMpwE99bLDnq4qsf0+zsMuiHNKhZF8/FQ5yA7nIlTVEYXw1MxhpZZ8skOg4e1+uCBVdGLvuS8=
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,11 @@ rightscale_backup Cookbook CHANGELOG
 
 This file is used to list changes made in each version of the rightscale_backup cookbook.
 
+v1.1.6
+------
+
+- Exclude CloudStack boot disk from list of volumes to backup.
+
 v1.1.5
 ------
 

diff --git a/libraries/provider_rightscale_backup.rb b/libraries/provider_rightscale_backup.rb
@@ -253,10 +253,12 @@ def get_volume_attachment_hrefs
         #   - attachments whose device parameter is set to 'unknown'
         #   - gce boot disk - shown by resource_uid of /disks/boot-*
         #   - aws ebs boot disk  - shown by device_id as '/dev/sda1'
+        #   - cloudstack boot disk  - shown by device_id as 'device_id:0'
         attachments.reject! do |attachment|
           attachment.device == 'unknown' ||
           attachment.resource_uid =~ /\/disks\/boot-/ ||
-          (node['cloud']['provider'] == 'ec2' && attachment.device_id == '/dev/sda1')
+          (node['cloud']['provider'] == 'ec2' && attachment.device_id == '/dev/sda1') ||
+          (node['cloud']['provider'] == 'cloudstack' && attachment.device_id == 'device_id:0')
         end
 
         attachments.map { |attachment| attachment.href }

diff --git a/metadata.rb b/metadata.rb
@@ -4,7 +4,7 @@
 license          'Apache 2.0'
 description      'Provides a resource to manage volume backups on any cloud RightScale supports.'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '1.1.5'
+version          '1.1.6'
 
 depends 'rightscale_volume', '~> 1.2.2'
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,11 @@ rightscale_backup Cookbook CHANGELOG @@
     This file is used to list changes made in each version of the rightscale_backup cookbook.
+    v1.1.6
+    ------
+    - Exclude CloudStack boot disk from list of volumes to backup.
     v1.1.5
     ------
@@ Expand Down @@