knife-ec2 1.0.28 → 1.0.31
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_ami_list.rb +1 -1
- data/lib/chef/knife/ec2_eip_list.rb +1 -1
- data/lib/chef/knife/ec2_flavor_list.rb +1 -1
- data/lib/chef/knife/ec2_securitygroup_list.rb +1 -1
- data/lib/chef/knife/ec2_server_create.rb +9 -3
- data/lib/chef/knife/ec2_server_delete.rb +1 -1
- data/lib/chef/knife/ec2_server_list.rb +1 -1
- data/lib/chef/knife/ec2_subnet_list.rb +1 -1
- data/lib/chef/knife/ec2_vpc_list.rb +1 -1
- data/lib/chef/knife/{ec2_base.rb → helpers/ec2_base.rb} +0 -0
- data/lib/chef/knife/{s3_source.rb → helpers/s3_source.rb} +0 -0
- data/lib/knife-ec2/version.rb +1 -1
- metadata +4 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 191cb9ed42a8c340aea59e089721e340d97609de0069aa917aab657a3e28f110
|
|
4
|
+
data.tar.gz: a43f3521bc5c5990c4e96eb63c65da53101c5b214e3279d8c3b5a0f79d8f51be
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: de93760c5ed5ca050beda5a13a4c52dd797585c1d2bac5812802b6b8db84a0a4037a9055c5f834846e1220996551dc18f76e163a319f5fb476e508eb22b788b3
|
|
7
|
+
data.tar.gz: a90c9495541b046fca2265e5750f56db14749a745550f670247ce9838a4a2c341fe2e413389713ee5907acc5fefc440127c07ae58bd14244e6274af23dfe0e26
|
|
@@ -17,8 +17,8 @@
|
|
|
17
17
|
# limitations under the License.
|
|
18
18
|
#
|
|
19
19
|
|
|
20
|
-
require_relative "ec2_base"
|
|
21
|
-
require_relative "s3_source"
|
|
20
|
+
require_relative "helpers/ec2_base"
|
|
21
|
+
require_relative "helpers/s3_source"
|
|
22
22
|
require "chef/knife/bootstrap"
|
|
23
23
|
|
|
24
24
|
class Chef
|
|
@@ -1409,7 +1409,13 @@ class Chef
|
|
|
1409
1409
|
def server_name
|
|
1410
1410
|
return nil unless server
|
|
1411
1411
|
|
|
1412
|
-
server.public_dns_name
|
|
1412
|
+
if !server.public_dns_name.empty?
|
|
1413
|
+
server.public_dns_name
|
|
1414
|
+
elsif !server.private_dns_name.empty?
|
|
1415
|
+
server.private_dns_name
|
|
1416
|
+
else
|
|
1417
|
+
server.private_ip_address
|
|
1418
|
+
end
|
|
1413
1419
|
end
|
|
1414
1420
|
|
|
1415
1421
|
alias host_descriptor server_name
|
|
File without changes
|
|
File without changes
|
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.31
|
|
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: 2020-
|
|
11
|
+
date: 2020-02-12 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: chef
|
|
@@ -61,7 +61,6 @@ extra_rdoc_files: []
|
|
|
61
61
|
files:
|
|
62
62
|
- LICENSE
|
|
63
63
|
- lib/chef/knife/ec2_ami_list.rb
|
|
64
|
-
- lib/chef/knife/ec2_base.rb
|
|
65
64
|
- lib/chef/knife/ec2_eip_list.rb
|
|
66
65
|
- lib/chef/knife/ec2_flavor_list.rb
|
|
67
66
|
- lib/chef/knife/ec2_securitygroup_list.rb
|
|
@@ -70,7 +69,8 @@ files:
|
|
|
70
69
|
- lib/chef/knife/ec2_server_list.rb
|
|
71
70
|
- lib/chef/knife/ec2_subnet_list.rb
|
|
72
71
|
- lib/chef/knife/ec2_vpc_list.rb
|
|
73
|
-
- lib/chef/knife/
|
|
72
|
+
- lib/chef/knife/helpers/ec2_base.rb
|
|
73
|
+
- lib/chef/knife/helpers/s3_source.rb
|
|
74
74
|
- lib/knife-ec2/version.rb
|
|
75
75
|
homepage: https://github.com/chef/knife-ec2
|
|
76
76
|
licenses:
|