chef-provisioning-ssh 0.0.5 → 0.0.6
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
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 0160449d53c76b17219f4ef4fe5dc8e55654e5d3
|
|
4
|
+
data.tar.gz: bd6731b3071044c7208ba30180b420dca411e331
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: b7a9c1006367c1d1286687070656b949e964efae71ca7f4f24b8d8dee3b333306ad9bfac4a8bebc98b6b5505aedd223069f09e1371800bbed2c352b1f6c2e484
|
|
7
|
+
data.tar.gz: deae4dfb868c0cbd77c2013475b6f75ada26fc9ab6001c21ea36806f16b8bf7503bd9d7af9ac30f70b5b2bcd2f7f521921ffb5b36defee4ce5bba911b58ff5c4
|
|
@@ -142,11 +142,16 @@ class Chef
|
|
|
142
142
|
end
|
|
143
143
|
|
|
144
144
|
def connect_to_machine(machine_spec, machine_options)
|
|
145
|
-
allocate_machine(action_handler, machine_spec, machine_options)
|
|
146
145
|
if machine_options[:transport_options] && machine_options[:transport_options]['is_windows']
|
|
147
146
|
machine_for(machine_spec, machine_options)
|
|
148
147
|
else
|
|
149
|
-
|
|
148
|
+
if machine_spec.location && ssh_machine_exists?(machine_spec.name)
|
|
149
|
+
_current_machine_options = existing_machine_hash(machine_spec)
|
|
150
|
+
current_machine_options = stringify_keys(_current_machine_options.dup)
|
|
151
|
+
end
|
|
152
|
+
host_for(current_machine_options['transport_options'])
|
|
153
|
+
initialize_ssh(current_machine_options['transport_options'])
|
|
154
|
+
machine_for(machine_spec, machine_options_for(current_machine_options))
|
|
150
155
|
end
|
|
151
156
|
end
|
|
152
157
|
|
|
@@ -321,7 +326,7 @@ class Chef
|
|
|
321
326
|
new_hash['ssh_options']['password'] = new_transport_options['password'] if new_transport_options['password']
|
|
322
327
|
end
|
|
323
328
|
|
|
324
|
-
merged_transport_options = Chef::Mixin::DeepMerge.merge(current_transport_options, new_transport_options)
|
|
329
|
+
merged_transport_options = Chef::Mixin::DeepMerge.merge(current_transport_options.to_hash, new_transport_options.to_hash)
|
|
325
330
|
_merged_transport_options = merged_transport_options.dup
|
|
326
331
|
updated_transport_options_hash = _merged_transport_options.dup
|
|
327
332
|
updated_transport_options_hash = Chef::Mixin::DeepMerge.merge(merged_transport_options, new_hash) unless new_hash.empty?
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: chef-provisioning-ssh
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.0.
|
|
4
|
+
version: 0.0.6
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Zack Zondlo
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-03-
|
|
11
|
+
date: 2015-03-25 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: chef-provisioning
|