knife-rackspace 1.0.5 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4f520eb07e5c851e61f833d48dd5d307890edc2076b228cc3b172c6d71d2636
-  data.tar.gz: 8a98e71b0defaaecf0544dd026cf64ed129a5127e390958f0bf8c5e2f53d9960
+  metadata.gz: 3799ca445b0f7ba27563c830cbf6650a780c57a46807431c342a100924d9167e
+  data.tar.gz: 9d2580b66da6812bcad820e2eb11f3ea4c07eaf792166949dff98d518421d03d
 SHA512:
-  metadata.gz: 83622510e2fd126c18d263a87868195900600a811926f40dbb1c9a865438f51d9684be30859aba225e6afe5a1b82a6cf6c2711806759c52323667687761bf808
-  data.tar.gz: 0f7a422d3a8b2307a5b7c1a5d629aeb7285b04e17ee8c3dc5abbcd89b3a8684eefaa09d6be581c0dc9b89d6b13bf5d75e212f973695842530e215c45b3d26106
+  metadata.gz: 96e95c86c1f6d6081ad501a9a8c47d0d2fefb3e26937cc2af73ebdd31f52ac3bc53c514dbb6bc2110a3756504de75502b7acd74b05dc06aac420eadbd690ce49
+  data.tar.gz: 4ac56dd985fd2fda28c1117c99c63e31bb440e498a728ffc52be9c90279f06741cae50236294341cb848a1c7ef51810ec43c350989dc1df6c6424c378c516759

data/lib/chef/knife/rackspace_server_create.rb

@@ -122,14 +122,25 @@ class Chef
       option :distro,
         :short => "-d DISTRO",
         :long => "--distro DISTRO",
-        :description => "Bootstrap a distro using a template; default is 'chef-full'",
-        :proc => Proc.new { |d| Chef::Config[:knife][:distro] = d }
+        :description => "Bootstrap a distro using a template. [DEPRECATED] Use -t / --bootstrap-template option instead.",
+        :proc        => Proc.new { |v|
+          Chef::Log.fatal("[DEPRECATED] -d / --distro option is deprecated. Use --bootstrap-template option instead.")
+          v
+        }
 
+      # @todo When we no longer support Chef 13 this can just go away
       option :template_file,
         :long => "--template-file TEMPLATE",
-        :description => "Full path to location of template to use",
-        :proc => Proc.new { |t| Chef::Config[:knife][:template_file] = t },
-        :default => false
+        :description => "Full path to location of template to use. [DEPRECATED] Use -t / --bootstrap-template option instead.",
+        :proc        => Proc.new { |v|
+          Chef::Log.fatal("[DEPRECATED] --template-file option is deprecated. Use --bootstrap-template option instead.")
+          v
+        }
+
+      option :bootstrap_template,
+        :short => "-t TEMPLATE",
+        :long => "--bootstrap-template TEMPLATE",
+        :description => "Bootstrap Chef using a built-in or custom template. Set to the full path of an erb template or use one of the built-in templates."
 
       option :run_list,
         :short => "-r RUN_LIST",
@@ -589,7 +600,6 @@ class Chef
         bootstrap.config[:bootstrap_vault_item] = locate_config_value(:bootstrap_vault_item) if locate_config_value(:bootstrap_vault_item)
         # bootstrap will run as root...sudo (by default) also messes up Ohai on CentOS boxes
         bootstrap.config[:use_sudo] = true unless locate_config_value(:ssh_user) == "root"
-        bootstrap.config[:distro] = locate_config_value(:distro) || "chef-full"
         bootstrap_common_params(bootstrap, server)
       end
 
@@ -603,7 +613,7 @@ class Chef
         end
         bootstrap.config[:prerelease] = locate_config_value(:prerelease)
         bootstrap.config[:bootstrap_version] = locate_config_value(:bootstrap_version)
-        bootstrap.config[:template_file] = locate_config_value(:template_file)
+        bootstrap.config[:bootstrap_template] = locate_config_value(:bootstrap_template)
         bootstrap.config[:first_boot_attributes] = locate_config_value(:first_boot_attributes)
         bootstrap.config[:bootstrap_proxy] = locate_config_value(:bootstrap_proxy)
         bootstrap.config[:encrypted_data_bag_secret] = locate_config_value(:secret)

data/lib/knife-rackspace/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Rackspace
-    VERSION = "1.0.5"
+    VERSION = "2.0.0"
     MAJOR, MINOR, TINY = VERSION.split(".")
   end
 end

data/spec/integration_spec_helper.rb

@@ -104,7 +104,7 @@ def capture_instance_data(stdout, labels = {})
   result
 end
 
-# Ideally this belongs in knife-dsl, but it causes a scoping conflict with knife.rb.
+# Ideally this belongs in knife-dsl, but it causes a scoping conflict with config.rb (knife.rb).
 # See https://github.com/chef-workflow/knife-dsl/issues/2
 def knife_capture(command, args = [], input = nil)
   null = Gem.win_platform? ? File.open("NUL:", "r") : File.open("/dev/null", "r")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-rackspace
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 2.0.0
 platform: ruby
 authors:
 - Adam Jacob
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-20 00:00:00.000000000 Z
+date: 2018-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knife-windows
@@ -48,14 +48,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 description: Rackspace Support for Chef's Knife Command
 email:
 - adam@chef.io
@@ -97,7 +97,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="