knife-rackspace 0.9.1 → 0.9.2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.9.2
+* KNIFE-480 Add support for user-data
+* --secret-file support for bootstrap
+
 ## v0.9.1
 * KNIFE-460 Remove extraneous flavor reloads
 * KNIFE-459 Add support for config-drive

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.16'
+  s.add_dependency "fog", '>= 1.22'
   s.add_dependency "chef", ">= 0.10.10"
   s.require_paths = ["lib"]
 

data/lib/chef/knife/rackspace_server_create.rb

@@ -107,7 +107,7 @@ class Chef
         :description => "The version of Chef to install",
         :proc => Proc.new { |v| Chef::Config[:knife][:bootstrap_version] = v }
 
-      option :distro,
+        option :distro,
         :short => "-d DISTRO",
         :long => "--distro DISTRO",
         :description => "Bootstrap a distro using a template; default is 'chef-full'",
@@ -209,12 +209,21 @@ class Chef
         :proc => Proc.new { |k| Chef::Config[:knife][:rackspace_config_drive] = k },
         :default => "false"
 
+      option :rackspace_user_data_file,
+        :long => "--rackspace_user_data_file USERDATA",
+        :description => "User data file will be placed in the openstack/latest/user_data directory on the config drive",
+        :proc => Proc.new { |k| Chef::Config[:knife][:rackspace_user_data] = k }
+
       option :ssh_keypair,
         :long => "--ssh-keypair KEYPAIR_NAME",
         :description => "Name of existing nova SSH keypair. Public key will be injected into the instance.",
         :proc => Proc.new { |v| Chef::Config[:knife][:rackspace_ssh_keypair] = v },
         :default => nil
 
+      option :secret_file,
+        :long => "--secret-file SECRET_FILE",
+        :description => "A file containing the secret key to use to encrypt data bag item values",
+        :proc => Proc.new { |sf| Chef::Config[:knife][:secret_file] = sf }
 
       def load_winrm_deps
         require 'winrm'
@@ -336,6 +345,7 @@ class Chef
           :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,
           :keypair => Chef::Config[:knife][:rackspace_ssh_keypair]
@@ -353,6 +363,8 @@ class Chef
         msg_pair("Flavor", server.flavor.name)
         msg_pair("Image", server.image.name)
         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("ServiceLevel Wait", rackspace_servicelevel_wait ? 'yes' : 'no')
         msg_pair("SSH Key", Chef::Config[:knife][:rackspace_ssh_keypair])
@@ -435,6 +447,20 @@ class Chef
         msg_pair("Environment", config[:environment] || '_default')
         msg_pair("Run List", config[:run_list].join(', '))
       end
+      
+      def user_data
+        file = Chef::Config[:knife][:rackspace_user_data]
+        return unless file
+        
+        begin
+          filename = File.expand_path(file)
+          content = File.read(filename)
+        rescue Errno::ENOENT => e
+          ui.error "Unable to read source file - #{filename}"
+          exit 1
+        end
+        content
+      end
 
       def bootstrap_for_node(server, bootstrap_ip_address)
         bootstrap = Chef::Knife::Bootstrap.new
@@ -466,7 +492,7 @@ class Chef
         bootstrap.config[:encrypted_data_bag_secret] = config[:encrypted_data_bag_secret]
         bootstrap.config[:encrypted_data_bag_secret_file] = config[:encrypted_data_bag_secret_file]
         bootstrap.config[:secret] = locate_config_value(:secret)
-        bootstrap.config[:secret_file] = locate_config_value(:secret_file)
+        bootstrap.config[:secret_file] = locate_config_value(:secret_file)  || ""
 
         Chef::Config[:knife][:hints] ||= {}
         Chef::Config[:knife][:hints]["rackspace"] ||= {}

data/lib/knife-rackspace/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Rackspace
-    VERSION = '0.9.1'
+    VERSION = '0.9.2'
     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.9.1
+  version: 0.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knife-windows
@@ -34,17 +34,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.22'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.22'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement