knife-ec2 1.0.22 → 1.0.25
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 +4 -4
- data/lib/chef/knife/ec2_server_create.rb +4 -3
- data/lib/knife-ec2/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: '090dfec07d3c033443e219dac5b1429c85f12df444d3fcb94df51d3d4dd43e50'
|
|
4
|
+
data.tar.gz: 8ba1490ac3c52e5f17044d20105ee4097f3b911c3e211d978f0ad3f77a84e6bf
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 78232e205b095a2107b679a094ea7e9d2d6dc23c7b2e76379b62ae62592df5f84dd91ef7a4bbecf0cbae9f0ac44d03af2e5aaa304c86294d30ac5908b0a20f59
|
|
7
|
+
data.tar.gz: 76e4ad596e206ab19a8191bcfe82acfbe83c5af33187ae3ebff826982618b1bfa74bd874028cfbd82110c7dc0666755f3d83296946810ad135c96b0205c949e9
|
|
@@ -31,6 +31,7 @@ class Chef
|
|
|
31
31
|
require "tempfile"
|
|
32
32
|
require "uri"
|
|
33
33
|
require "net/ssh"
|
|
34
|
+
require "net/ssh/gateway"
|
|
34
35
|
Chef::Knife::Bootstrap.load_deps
|
|
35
36
|
end
|
|
36
37
|
|
|
@@ -580,7 +581,7 @@ class Chef
|
|
|
580
581
|
end
|
|
581
582
|
|
|
582
583
|
def plugin_validate_options!
|
|
583
|
-
if Chef::Config[:knife].
|
|
584
|
+
if Chef::Config[:knife].key?(:aws_ssh_key_id)
|
|
584
585
|
Chef::Config[:knife][:ssh_key_name] = Chef::Config[:knife][:aws_ssh_key_id] unless Chef::Config[:knife][:ssh_key_name]
|
|
585
586
|
Chef::Config[:knife].delete(:aws_ssh_key_id)
|
|
586
587
|
ui.warn("Use of aws_ssh_key_id option in knife.rb/config.rb config is deprecated, use ssh_key_name option instead.")
|
|
@@ -1177,7 +1178,7 @@ class Chef
|
|
|
1177
1178
|
end
|
|
1178
1179
|
|
|
1179
1180
|
def create_key_pair
|
|
1180
|
-
key_name = "#{config[:connection_user]}-#{SecureRandom.hex(10)}"
|
|
1181
|
+
key_name = "#{config[:connection_user].delete(".\\")}-#{SecureRandom.hex(10)}"
|
|
1181
1182
|
key_pair = ec2_connection.create_key_pair({
|
|
1182
1183
|
key_name: key_name,
|
|
1183
1184
|
})
|
|
@@ -1448,7 +1449,7 @@ class Chef
|
|
|
1448
1449
|
parse_aws_tags.map { |t| key, val = t.split("="); ht[key] = val } unless parse_aws_tags.nil?
|
|
1449
1450
|
|
|
1450
1451
|
# Always set the Name tag
|
|
1451
|
-
unless ht.
|
|
1452
|
+
unless ht.key?("Name")
|
|
1452
1453
|
if config_value(:chef_node_name)
|
|
1453
1454
|
ht["Name"] = evaluate_node_name(config_value(:chef_node_name))
|
|
1454
1455
|
else
|
data/lib/knife-ec2/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: knife-ec2
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.0.
|
|
4
|
+
version: 1.0.25
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Chef Software, Inc.
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2019-12-
|
|
11
|
+
date: 2019-12-23 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: chef
|