Merge a4dedd5 into 0cf4a25

fog · Jul 1, 2014 · 887b24d · 887b24d
2 parents 0cf4a25 + a4dedd5
commit 887b24d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/fog/openstack/requests/compute/create_volume.rb b/lib/fog/openstack/requests/compute/create_volume.rb
@@ -11,7 +11,7 @@ def create_volume(name, description, size, options={})
             }
           }
 
-          vanilla_options = ['snapshot_id']
+          vanilla_options = ['snapshot_id', 'availability_zone']
           vanilla_options.select{|o| options[o]}.each do |key|
             data['volume'][key] = options[key]
           end

diff --git a/lib/fog/openstack/requests/volume/create_volume.rb b/lib/fog/openstack/requests/volume/create_volume.rb
@@ -12,7 +12,7 @@ def create_volume(name, description, size, options={})
           }
 
           vanilla_options = [:snapshot_id, :imageRef, :volume_type,
-            :source_volid]
+            :source_volid, :availability_zone]
           vanilla_options.select{|o| options[o]}.each do |key|
             data['volume'][key] = options[key]
           end