knife-rackspace 0.10.2 → 0.11.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTY3YTI3NWM4ZjIwMjllYWQ4ODdmYjM2OGY3ODQ3ZjVjMzJlYmQwYg==
+    M2NhZmI1NDM4OWUxODEwODI1ZGVmNWQ2YzgxZjBjNmJiYjMzOGVkYQ==
   data.tar.gz: !binary |-
-    M2UxNzc5OTNhOTc0ZWY2M2YxZWUxMjZmYTJjYjE2ZDg3NDE5MmIyMg==
+    OTY4MTM0MTMzNzY5M2U4NWUwMmMxNmFhZWEyNjQ3YjQzYTdkNWMwZA==
 SHA512:
   metadata.gz: !binary |-
-    NmY5ZjRkODg0MTVjMGE0ZjMzNjAxNDM4ZjMzOTgwNDRhYjYwZDZkN2M4Yzg5
-    MGZiMjY3MjhmZjk3ZWZkNzY5NmE1MWMxZjNkMjg2OGYyMWZiMjBlN2UxNzYx
-    NDEzZTI2ZDNjZTc3Y2JhOTI4NWZjMzgxNTk3YTJiMGI0NWQ0NDY=
+    NTdjN2ZlMzBiNjUwZDZjODQ0M2U1YmQyODkwMTA0MGMyMTIxYjZmYTNhODQ5
+    MGExY2U5NmEzMzc5MTUxMWE4YzkwZDBiMGJmNzMxZTAyODc2MzZmMjdiMjg1
+    NzVlMWU0NWZlYjY1Yzc5MDU2OWE4MjI4NGUxMjM4N2I5MGFjZjQ=
   data.tar.gz: !binary |-
-    M2Y2MzU3MTI5YzAyMTkwMjQwYjE4ZTU3ZjdiYWU3Y2YwMjAxYWNjNmUxMjI2
-    ODJkM2YzZTYwYzgwZDZmMTdhNjFkZDQwNThjMGQ1OWQzODU2YzRlMDg0NDIx
-    MTA0YjQ4NzFhMDY3NWNkMWM5MmJhNzBkYWNmZjJlYjEzNGE1MTk=
+    YTVkNjkwMjM4MDM0YTZhZDdjNmEzZDhlYzY2OTk4NTA3MTdmODE2YjgyNzRj
+    MzJjODA0MjY1MmFhNjY5NzFmMWFhMzY4YjhlZjQ4OTA1MTkwNGRlMjBiZTc4
+    Mzk4MjE1OGU3ODkyOTM3NDJmMWQ1ZDcxYWQ5MGY4YjI4ZTdjN2E=

data/CHANGELOG.md

@@ -1,5 +1,8 @@
+## v0.11.0
+* Add -B (boot volume ID) to `knife rackspace server create` - #91
+
 ## v0.10.1
-* Support new chef-vault bootrap flags (--bootstrap-vault-file, -bootstrap-vault-json, and --bootstrap-vault-item)
+* Support new chef-vault boostrap flags (--bootstrap-vault-file, -bootstrap-vault-json, and --bootstrap-vault-item)
 
 ## v0.10.0
 * KNIFE-498 knife rackspace uses direct TCP connection on port 22 to verify SSHD

data/knife-rackspace.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.add_dependency "knife-windows"
-  s.add_dependency "fog", '>= 1.22'
+  s.add_dependency "fog", '>= 1.24'
   s.add_dependency "chef", ">= 0.10.10"
   s.require_paths = ["lib"]
 

data/lib/chef/knife/rackspace_server_create.rb

@@ -54,6 +54,12 @@ class Chef
         :description => "The image of the server",
         :proc => Proc.new { |i| Chef::Config[:knife][:image] = i.to_s }
 
+      option :boot_volume_id,
+        :short => "-B BOOT_VOLUME_ID",
+        :long => "--boot-volume-id UUID",
+        :description => "The image CBS UUID to use as the server's boot device",
+        :proc => Proc.new { |i| Chef::Config[:knife][:boot_volume_id] = i.to_s }
+
       option :server_name,
         :short => "-S NAME",
         :long => "--server-name NAME",
@@ -365,52 +371,78 @@ class Chef
       def run
         $stdout.sync = true
 
+        server_create_options = {
+          :metadata => Chef::Config[:knife][:rackspace_metadata],
+          :disk_config => Chef::Config[:knife][:rackspace_disk_config],
+          :user_data => user_data,
+          :config_drive => locate_config_value(:rackspace_config_drive) || false,
+          :personality => files,
+          :key_name => Chef::Config[:knife][:rackspace_ssh_keypair],
+          :name => get_node_name(config[:chef_node_name] || config[:server_name]),
+          :networks => get_networks(Chef::Config[:knife][:rackspace_networks], Chef::Config[:knife][:rackconnect_v3_network_id]),
+        }
+
         # Maybe deprecate this option at some point
         config[:bootstrap_network] = 'private' if config[:private_network]
 
-        unless Chef::Config[:knife][:image]
-          ui.error("You have not provided a valid image value.  Please note the short option for this value recently changed from '-i' to '-I'.")
+        flavor_id = locate_config_value(:flavor)
+        flavor = connection.flavors.get(flavor_id)
+        if !flavor
+          ui.error("Invalid Flavor ID: #{flavor_id}")
           exit 1
+        else
+          server_create_options[:flavor_id] = flavor.id
+        end
+
+        # This is somewhat a hack, but Rackspace's API returns '0' for flavors
+        # that must be backed by a CBS volume.
+        #
+        # In the case we are trying to create one of these flavors, we should
+        # swap out the image_id argument with the boot_image_id argument.
+        if flavor.disk == 0
+          server_create_options[:image_id] = ''
+          server_create_options[:boot_volume_id] = Chef::Config[:knife][:boot_volume_id]
+          server_create_options[:boot_image_id] = Chef::Config[:knife][:image]
+
+          if server_create_options[:boot_image_id] && server_create_options[:boot_volume_id]
+            ui.error('Please specify exactly one of --boot-volume-id (-B) and --image (-I)')
+            exit 1
+          end
+        else
+          server_create_options[:image_id] = Chef::Config[:knife][:image]
+
+          if !server_create_options[:image_id]
+            ui.error('Please specify an Image ID for the server with --image (-I)')
+            exit 1
+          end
         end
 
         if locate_config_value(:bootstrap_protocol) == 'winrm'
           load_winrm_deps
         end
 
-        rackconnect_wait            = Chef::Config[:knife][:rackconnect_wait] || config[:rackconnect_wait]
-        rackconnect3                = Chef::Config[:knife][:rackconnect_v3_network_id] || config[:rackconnect_v3_network_id]
-        rackspace_servicelevel_wait = Chef::Config[:knife][:rackspace_servicelevel_wait] || config[:rackspace_servicelevel_wait]
-        node_name                   = get_node_name(config[:chef_node_name] || config[:server_name])
-        networks                    = get_networks(Chef::Config[:knife][:rackspace_networks], rackconnect3)
-
-        server = connection.servers.new(
-          :name         => node_name,
-          :image_id     => Chef::Config[:knife][:image],
-          :flavor_id    => locate_config_value(:flavor),
-          :metadata     => Chef::Config[:knife][:rackspace_metadata],
-          :disk_config  => Chef::Config[:knife][:rackspace_disk_config],
-          :user_data    => user_data,
-          :config_drive => locate_config_value(:rackspace_config_drive) || false,
-          :personality  => files,
-          :key_name     => Chef::Config[:knife][:rackspace_ssh_keypair]
-        )
+        server = connection.servers.new(server_create_options)
 
         if version_one?
           server.save
         else
-          server.save(:networks => networks)
+          server.save(:networks => server_create_options[:networks])
         end
 
+        rackconnect_wait = Chef::Config[:knife][:rackconnect_wait] || config[:rackconnect_wait]
+        rackspace_servicelevel_wait = Chef::Config[:knife][:rackspace_servicelevel_wait] || config[:rackspace_servicelevel_wait]
+
         msg_pair("Instance ID", server.id)
         msg_pair("Host ID", server.host_id)
         msg_pair("Name", server.name)
         msg_pair("Flavor", server.flavor.name)
-        msg_pair("Image", server.image.name)
+        msg_pair("Image", server.image.name) if server.image
+        msg_pair("Boot Image ID", server.boot_image_id) if server.boot_image_id
         msg_pair("Metadata", server.metadata.all)
         msg_pair("ConfigDrive", server.config_drive)
         msg_pair("UserData", Chef::Config[:knife][:rackspace_user_data])
         msg_pair("RackConnect Wait", rackconnect_wait ? 'yes' : 'no')
-        msg_pair("RackConnect V3", rackconnect3 ? 'yes' : 'no')
+        msg_pair("RackConnect V3", Chef::Config[:knife][:rackconnect_v3_network_id] ? 'yes' : 'no')
         msg_pair("ServiceLevel Wait", rackspace_servicelevel_wait ? 'yes' : 'no')
         msg_pair("SSH Key", Chef::Config[:knife][:rackspace_ssh_keypair])
 
@@ -457,7 +489,7 @@ class Chef
           end
         end
 
-        if networks && Chef::Config[:knife][:rackspace_networks]
+        if server_create_options[:networks] && Chef::Config[:knife][:rackspace_networks]
           msg_pair("Networks", Chef::Config[:knife][:rackspace_networks].sort.join(', '))
         end
 

data/lib/knife-rackspace/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Rackspace
-    VERSION = '0.10.2'
+    VERSION = '0.11.0'
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-rackspace
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.11.0
 platform: ruby
 authors:
 - Adam Jacob
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-15 00:00:00.000000000 Z
+date: 2015-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knife-windows
@@ -34,14 +34,14 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.22'
+        version: '1.24'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.22'
+        version: '1.24'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement