From 949831374121a3e949fe45a27e7e64a0b31f042c Mon Sep 17 00:00:00 2001
From: Alain De Carolis <adecarolis@schoology.com>
Date: Thu, 13 Aug 2015 12:21:41 -0400
Subject: [PATCH] Add boot_volume_size to RS compute_v2 Server Create

Keeps the default value to 100GB but allows specifying other sizes
---
 lib/fog/rackspace/models/compute_v2/server.rb          | 6 ++++++
 lib/fog/rackspace/requests/compute_v2/create_server.rb | 9 +++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/lib/fog/rackspace/models/compute_v2/server.rb b/lib/fog/rackspace/models/compute_v2/server.rb
index 6b84c1a90..5bfb50918 100644
--- a/lib/fog/rackspace/models/compute_v2/server.rb
+++ b/lib/fog/rackspace/models/compute_v2/server.rb
@@ -153,6 +153,11 @@ module Fog
         # @see http://developer.openstack.org/api-ref-compute-v2-ext.html#ext-os-block-device-mapping-v2-boot
         attribute :boot_volume_id
 
+        # @!attribute [w] boot_volume_size
+        # @return [Integer] The Size of the boot volume to be created by the BlockStorage service.
+        # @see http://developer.openstack.org/api-ref-compute-v2-ext.html#ext-os-block-device-mapping-v2-boot
+        attribute :boot_volume_size
+
         # @!attribute [w] boot_image_id
         # @return [String] The ID of an image to create a bootable volume from.
         # @see http://developer.openstack.org/api-ref-compute-v2-ext.html#ext-os-block-device-mapping-v2-boot
@@ -264,6 +269,7 @@ module Fog
           modified_options[:key_name] ||= attributes[:key_name]
           modified_options[:boot_volume_id] ||= attributes[:boot_volume_id]
           modified_options[:boot_image_id] ||= attributes[:boot_image_id]
+          modified_options[:boot_volume_size] ||= attributes[:boot_volume_size]
 
           if modified_options[:networks]
             modified_options[:networks].map! { |id| { :uuid => id } }
diff --git a/lib/fog/rackspace/requests/compute_v2/create_server.rb b/lib/fog/rackspace/requests/compute_v2/create_server.rb
index a0481396e..6b2f50c93 100644
--- a/lib/fog/rackspace/requests/compute_v2/create_server.rb
+++ b/lib/fog/rackspace/requests/compute_v2/create_server.rb
@@ -18,6 +18,7 @@ module Fog
         #   attachment of volumes to this server. Mutually exclusive with :volume_id or :volume_image_id. If provided, leave image_id
         #   as "". See http://developer.openstack.org/api-ref-compute-v2-ext.html#ext-os-block-device-mapping-v2-boot for details.
         # @option options [String] boot_volume_id Id of a pre-created bootable volume to use for this server. If provided, leave image_id as "".
+        # @option options [Integer] boot_volume_size Size of the bootable volume to be created expressed in GB. (defaults to 100)
         # @option options [String] boot_image_id Id of an image to create a bootable volume from and attach to this server. If provided,
         #   leave image_id as "".
         # @return [Excon::Response] response:
@@ -96,12 +97,16 @@ module Fog
                 Fog::Logger.warning(":boot_volume_id overrides :boot_image_id!")
               end
 
+              if options[:boot_volume_size]
+                Fog::Logger.warning("Boot volume size: " + options[:boot_volume_size] + "GB")
+              end
+
               data['server']['block_device_mapping_v2'] = [{
                 'boot_index' => '0',
                 'uuid' => options[:boot_volume_id],
                 'source_type' => 'volume',
                 'destination_type' => 'volume',
-                'volume_size' => 100
+                'volume_size' => options[:boot_volume_size] ? options[:boot_volume_size] : 100
               }]
             end
 
@@ -111,7 +116,7 @@ module Fog
                 'uuid' => options[:boot_image_id],
                 'source_type' => 'image',
                 'destination_type' => 'volume',
-                'volume_size' => 100
+                'volume_size' => options[:boot_volume_size] ? options[:boot_volume_size] : 100
               }]
             end
         end