knife-rackspace 1.0.5 → 2.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f4f520eb07e5c851e61f833d48dd5d307890edc2076b228cc3b172c6d71d2636
4
- data.tar.gz: 8a98e71b0defaaecf0544dd026cf64ed129a5127e390958f0bf8c5e2f53d9960
3
+ metadata.gz: 3799ca445b0f7ba27563c830cbf6650a780c57a46807431c342a100924d9167e
4
+ data.tar.gz: 9d2580b66da6812bcad820e2eb11f3ea4c07eaf792166949dff98d518421d03d
5
5
  SHA512:
6
- metadata.gz: 83622510e2fd126c18d263a87868195900600a811926f40dbb1c9a865438f51d9684be30859aba225e6afe5a1b82a6cf6c2711806759c52323667687761bf808
7
- data.tar.gz: 0f7a422d3a8b2307a5b7c1a5d629aeb7285b04e17ee8c3dc5abbcd89b3a8684eefaa09d6be581c0dc9b89d6b13bf5d75e212f973695842530e215c45b3d26106
6
+ metadata.gz: 96e95c86c1f6d6081ad501a9a8c47d0d2fefb3e26937cc2af73ebdd31f52ac3bc53c514dbb6bc2110a3756504de75502b7acd74b05dc06aac420eadbd690ce49
7
+ data.tar.gz: 4ac56dd985fd2fda28c1117c99c63e31bb440e498a728ffc52be9c90279f06741cae50236294341cb848a1c7ef51810ec43c350989dc1df6c6424c378c516759
@@ -122,14 +122,25 @@ class Chef
122
122
  option :distro,
123
123
  :short => "-d DISTRO",
124
124
  :long => "--distro DISTRO",
125
- :description => "Bootstrap a distro using a template; default is 'chef-full'",
126
- :proc => Proc.new { |d| Chef::Config[:knife][:distro] = d }
125
+ :description => "Bootstrap a distro using a template. [DEPRECATED] Use -t / --bootstrap-template option instead.",
126
+ :proc => Proc.new { |v|
127
+ Chef::Log.fatal("[DEPRECATED] -d / --distro option is deprecated. Use --bootstrap-template option instead.")
128
+ v
129
+ }
127
130
 
131
+ # @todo When we no longer support Chef 13 this can just go away
128
132
  option :template_file,
129
133
  :long => "--template-file TEMPLATE",
130
- :description => "Full path to location of template to use",
131
- :proc => Proc.new { |t| Chef::Config[:knife][:template_file] = t },
132
- :default => false
134
+ :description => "Full path to location of template to use. [DEPRECATED] Use -t / --bootstrap-template option instead.",
135
+ :proc => Proc.new { |v|
136
+ Chef::Log.fatal("[DEPRECATED] --template-file option is deprecated. Use --bootstrap-template option instead.")
137
+ v
138
+ }
139
+
140
+ option :bootstrap_template,
141
+ :short => "-t TEMPLATE",
142
+ :long => "--bootstrap-template TEMPLATE",
143
+ :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."
133
144
 
134
145
  option :run_list,
135
146
  :short => "-r RUN_LIST",
@@ -589,7 +600,6 @@ class Chef
589
600
  bootstrap.config[:bootstrap_vault_item] = locate_config_value(:bootstrap_vault_item) if locate_config_value(:bootstrap_vault_item)
590
601
  # bootstrap will run as root...sudo (by default) also messes up Ohai on CentOS boxes
591
602
  bootstrap.config[:use_sudo] = true unless locate_config_value(:ssh_user) == "root"
592
- bootstrap.config[:distro] = locate_config_value(:distro) || "chef-full"
593
603
  bootstrap_common_params(bootstrap, server)
594
604
  end
595
605
 
@@ -603,7 +613,7 @@ class Chef
603
613
  end
604
614
  bootstrap.config[:prerelease] = locate_config_value(:prerelease)
605
615
  bootstrap.config[:bootstrap_version] = locate_config_value(:bootstrap_version)
606
- bootstrap.config[:template_file] = locate_config_value(:template_file)
616
+ bootstrap.config[:bootstrap_template] = locate_config_value(:bootstrap_template)
607
617
  bootstrap.config[:first_boot_attributes] = locate_config_value(:first_boot_attributes)
608
618
  bootstrap.config[:bootstrap_proxy] = locate_config_value(:bootstrap_proxy)
609
619
  bootstrap.config[:encrypted_data_bag_secret] = locate_config_value(:secret)
@@ -1,6 +1,6 @@
1
1
  module Knife
2
2
  module Rackspace
3
- VERSION = "1.0.5"
3
+ VERSION = "2.0.0"
4
4
  MAJOR, MINOR, TINY = VERSION.split(".")
5
5
  end
6
6
  end
@@ -104,7 +104,7 @@ def capture_instance_data(stdout, labels = {})
104
104
  result
105
105
  end
106
106
 
107
- # Ideally this belongs in knife-dsl, but it causes a scoping conflict with knife.rb.
107
+ # Ideally this belongs in knife-dsl, but it causes a scoping conflict with config.rb (knife.rb).
108
108
  # See https://github.com/chef-workflow/knife-dsl/issues/2
109
109
  def knife_capture(command, args = [], input = nil)
110
110
  null = Gem.win_platform? ? File.open("NUL:", "r") : File.open("/dev/null", "r")
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: knife-rackspace
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.5
4
+ version: 2.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Adam Jacob
@@ -12,7 +12,7 @@ authors:
12
12
  autorequire:
13
13
  bindir: bin
14
14
  cert_chain: []
15
- date: 2018-11-20 00:00:00.000000000 Z
15
+ date: 2018-11-28 00:00:00.000000000 Z
16
16
  dependencies:
17
17
  - !ruby/object:Gem::Dependency
18
18
  name: knife-windows
@@ -48,14 +48,14 @@ dependencies:
48
48
  requirements:
49
49
  - - ">="
50
50
  - !ruby/object:Gem::Version
51
- version: '12.0'
51
+ version: '13.0'
52
52
  type: :runtime
53
53
  prerelease: false
54
54
  version_requirements: !ruby/object:Gem::Requirement
55
55
  requirements:
56
56
  - - ">="
57
57
  - !ruby/object:Gem::Version
58
- version: '12.0'
58
+ version: '13.0'
59
59
  description: Rackspace Support for Chef's Knife Command
60
60
  email:
61
61
  - adam@chef.io
@@ -97,7 +97,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
97
97
  requirements:
98
98
  - - ">="
99
99
  - !ruby/object:Gem::Version
100
- version: 2.2.2
100
+ version: '2.3'
101
101
  required_rubygems_version: !ruby/object:Gem::Requirement
102
102
  requirements:
103
103
  - - ">="