cheese-chef-provisioning-azurerm 1.0.6 → 1.0.7

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 63a6e6149ea3283667ba760b2740d32ad76635f3
4
- data.tar.gz: bf99a9dbadc303908e7f903f55c7a5b4909ad0dc
3
+ metadata.gz: 0f501881562076e732f468745379839590324a30
4
+ data.tar.gz: 9f2cd2a3ed2fc68ff0d0940b40e6a1f4262b662d
5
5
  SHA512:
6
- metadata.gz: b27108b6cc386f8b88f2bfd0a51dce3b1d5da6c651fea8e62eb74532616d4af6ec285538f2af7394ef9777e21da0f4b81b0c17c2d0c1330e7d07d69281b3464d
7
- data.tar.gz: 2ad8d9e57e5cd6efc36faa34782b844c91dbf127ff3074008216a5df03a56a6846270424e43744ea0b1575764cf23f66ba53cc234a9d626b59bbdc58e10560e4
6
+ metadata.gz: 4e15a311e699d333fe281817b7bfd941c16bbea6e3f9234842a5a5821d4a1da41c1fdd34d2af4adb448544a61fa166ccf27c6f45cdab2e856a8257fe1d72b52d
7
+ data.tar.gz: bfeaa69e93a5a26eb9fd9386a52abe03996832c3755a04acf818d00cdec6f27afe31570d486286e8b6011a34af1a5069b6df890d247a35b4a1a9083efb828357
@@ -274,6 +274,16 @@ class Chef
274
274
  action_handler.report_progress "Created #{machine_spec.name} in #{location}..."
275
275
  end
276
276
 
277
+ def connect_to_machine(name, chef_server = nil)
278
+ if name.is_a?(MachineSpec)
279
+ machine_spec = name
280
+ else
281
+ machine_spec = Chef::Provisioning::ChefMachineSpec.get(name, chef_server)
282
+ end
283
+
284
+ machine_for(machine_spec, machine_spec.reference)
285
+ end
286
+
277
287
  # (see Chef::Provisioning::Driver#ready_machine)
278
288
  def ready_machine(action_handler, machine_spec, machine_options)
279
289
  machine_options = deep_symbolize_keys(machine_options)
@@ -379,11 +389,7 @@ class Chef
379
389
 
380
390
  def create_ssh_transport(machine_spec, machine_options, vm)
381
391
  ssh_options = ssh_options_for(machine_spec, machine_options, vm)
382
- bootstrap_options = (machine_options[:bootstrap_options] || {}).dup
383
- username = machine_spec.reference['adminUsername'] || bootstrap_options[:osProfile][:adminUsername] || default_ssh_username
384
- if bootstrap_options[:osProfile][:adminUsername] != machine_spec.reference['adminUsername']
385
- Chef::Log.warn("Server #{machine_spec.name} was created with SSH username #{machine_spec.reference['adminUsername']} and machine_options specifies username #{bootstrap_options[:osProfile][:adminUsername]}. Using #{machine_spec.reference['adminUsername']}. Please edit the node and change the chef_provisioning.reference.adminUsername attribute if you want to change it.")
386
- end
392
+ username = machine_spec.reference['adminUsername'] || default_ssh_username
387
393
  options = {}
388
394
  if machine_spec.reference[:sudo] || (!machine_spec.reference.has_key?(:sudo) && username != 'root')
389
395
  options[:prefix] = 'sudo '
@@ -1,7 +1,7 @@
1
1
  class Chef
2
2
  module Provisioning
3
3
  module AzureRM
4
- VERSION = '1.0.6'.freeze
4
+ VERSION = '1.0.7'.freeze
5
5
  end
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cheese-chef-provisioning-azurerm
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.6
4
+ version: 1.0.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Stuart Preston
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2017-04-12 00:00:00.000000000 Z
12
+ date: 2017-04-21 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: chef
@@ -45,80 +45,56 @@ dependencies:
45
45
  requirements:
46
46
  - - "~>"
47
47
  - !ruby/object:Gem::Version
48
- version: '0.5'
49
- - - ">="
50
- - !ruby/object:Gem::Version
51
- version: 0.5.0
48
+ version: '0.10'
52
49
  type: :runtime
53
50
  prerelease: false
54
51
  version_requirements: !ruby/object:Gem::Requirement
55
52
  requirements:
56
53
  - - "~>"
57
54
  - !ruby/object:Gem::Version
58
- version: '0.5'
59
- - - ">="
60
- - !ruby/object:Gem::Version
61
- version: 0.5.0
55
+ version: '0.10'
62
56
  - !ruby/object:Gem::Dependency
63
57
  name: azure_mgmt_storage
64
58
  requirement: !ruby/object:Gem::Requirement
65
59
  requirements:
66
60
  - - "~>"
67
61
  - !ruby/object:Gem::Version
68
- version: '0.5'
69
- - - ">="
70
- - !ruby/object:Gem::Version
71
- version: 0.5.0
62
+ version: '0.10'
72
63
  type: :runtime
73
64
  prerelease: false
74
65
  version_requirements: !ruby/object:Gem::Requirement
75
66
  requirements:
76
67
  - - "~>"
77
68
  - !ruby/object:Gem::Version
78
- version: '0.5'
79
- - - ">="
80
- - !ruby/object:Gem::Version
81
- version: 0.5.0
69
+ version: '0.10'
82
70
  - !ruby/object:Gem::Dependency
83
71
  name: azure_mgmt_compute
84
72
  requirement: !ruby/object:Gem::Requirement
85
73
  requirements:
86
74
  - - "~>"
87
75
  - !ruby/object:Gem::Version
88
- version: '0.5'
89
- - - ">="
90
- - !ruby/object:Gem::Version
91
- version: 0.5.0
76
+ version: '0.10'
92
77
  type: :runtime
93
78
  prerelease: false
94
79
  version_requirements: !ruby/object:Gem::Requirement
95
80
  requirements:
96
81
  - - "~>"
97
82
  - !ruby/object:Gem::Version
98
- version: '0.5'
99
- - - ">="
100
- - !ruby/object:Gem::Version
101
- version: 0.5.0
83
+ version: '0.10'
102
84
  - !ruby/object:Gem::Dependency
103
85
  name: azure_mgmt_network
104
86
  requirement: !ruby/object:Gem::Requirement
105
87
  requirements:
106
88
  - - "~>"
107
89
  - !ruby/object:Gem::Version
108
- version: '0.5'
109
- - - ">="
110
- - !ruby/object:Gem::Version
111
- version: 0.5.0
90
+ version: '0.10'
112
91
  type: :runtime
113
92
  prerelease: false
114
93
  version_requirements: !ruby/object:Gem::Requirement
115
94
  requirements:
116
95
  - - "~>"
117
96
  - !ruby/object:Gem::Version
118
- version: '0.5'
119
- - - ">="
120
- - !ruby/object:Gem::Version
121
- version: 0.5.0
97
+ version: '0.10'
122
98
  - !ruby/object:Gem::Dependency
123
99
  name: bundler
124
100
  requirement: !ruby/object:Gem::Requirement