clc-chef-metal-vsphere 0.3.48 → 0.3.49
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:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e44eddddcd63d7c14ad37e572fd362d2d056215e
|
4
|
+
data.tar.gz: 882e9e8d9fb68fd3191ecf9b26cce46d57231bde
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 266f18cbc604adc530ce38378fc56129e6b05759beef845deb6707c7f234d810de9ddd82c9364e321c3b39d16a98025b6309cbd546beab3f7df057c02340f477
|
7
|
+
data.tar.gz: 91da0ad2ae927d666988db6c812f34a610eff213f9f68b459aacf73dfd3c2ce29b11b8b5cf68b442ae1301b2034784f418c29c98b9095a53b485c4e628457177
|
@@ -491,7 +491,7 @@ module ChefMetalVsphere
|
|
491
491
|
require 'chef_metal/transport/winrm'
|
492
492
|
bootstrap_options = bootstrap_options_for(machine_spec, machine_options)
|
493
493
|
ssh_options = bootstrap_options[:ssh]
|
494
|
-
remote_host = ip_for(bootstrap_options, vm)
|
494
|
+
remote_host = machine_spec.location['ipaddress'] || ip_for(bootstrap_options, vm)
|
495
495
|
winrm_options = {:user => "#{ssh_options[:user]}", :pass => ssh_options[:password], :basic_auth_only => true}
|
496
496
|
|
497
497
|
ChefMetal::Transport::WinRM.new("http://#{remote_host}:5985/wsman", :plaintext, winrm_options, config)
|
@@ -502,7 +502,7 @@ module ChefMetalVsphere
|
|
502
502
|
bootstrap_options = bootstrap_options_for(machine_spec, machine_options)
|
503
503
|
ssh_options = bootstrap_options[:ssh]
|
504
504
|
ssh_user = ssh_options[:user]
|
505
|
-
remote_host = ip_for(bootstrap_options, vm)
|
505
|
+
remote_host = machine_spec.location['ipaddress'] || ip_for(bootstrap_options, vm)
|
506
506
|
|
507
507
|
ChefMetal::Transport::SSH.new(remote_host, ssh_user, ssh_options, {}, config)
|
508
508
|
end
|
@@ -19,7 +19,7 @@
|
|
19
19
|
:num_cpus => 2,
|
20
20
|
#:network_name => ['vlan_20_172.21.20'],
|
21
21
|
#:network_name => ['vlan10_172.21.10-vm'],
|
22
|
-
:network_name => ['
|
22
|
+
:network_name => ['vlan_20_172.21.20','vlan_74_build'],
|
23
23
|
:memory_mb => 4096,
|
24
24
|
:resource_pool => 'CLSTR02/DLAB',
|
25
25
|
:additional_disk_size_gb => 50,
|
@@ -33,13 +33,13 @@
|
|
33
33
|
:convergence_options => {},
|
34
34
|
:customization_spec => {
|
35
35
|
:ipsettings => {
|
36
|
-
|
37
|
-
|
38
|
-
|
36
|
+
#:ip => '172.21.20.190',
|
37
|
+
#:subnetMask => '255.255.255.0',
|
38
|
+
#:gateway => ["172.21.20.1"],
|
39
39
|
:dnsServerList => ["192.168.64.19","192.168.64.20"]
|
40
40
|
},
|
41
41
|
:domain => 't3n.dom',
|
42
|
-
:domainAdmin => "tier3sa
|
42
|
+
:domainAdmin => "tier3sa",
|
43
43
|
:domainAdminPassword => '4u2bn01!!@#$',
|
44
44
|
:org_name => 'Tier3',
|
45
45
|
:product_id => 'W3GGN-FT8W3-Y4M27-J84CP-Q3VJ9',
|
@@ -129,20 +129,20 @@ describe "vsphere_driver" do
|
|
129
129
|
end
|
130
130
|
end
|
131
131
|
|
132
|
-
context "destroy_machine" do
|
132
|
+
# context "destroy_machine" do
|
133
133
|
|
134
|
-
|
135
|
-
|
136
|
-
|
137
|
-
|
138
|
-
|
139
|
-
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
|
144
|
-
|
145
|
-
|
146
|
-
|
147
|
-
end
|
134
|
+
# it "removes the machine" do
|
135
|
+
# Cheffish.honor_local_mode do
|
136
|
+
# chef_server = Cheffish.default_chef_server(Cheffish.profiled_config)
|
137
|
+
# driver = ChefMetal.driver_for_url("vsphere://#{@metal_config[:driver_options][:host]}", @metal_config)
|
138
|
+
# action_handler = ChefMetal::ActionHandler.new
|
139
|
+
# machine_spec = ChefMetal::ChefMachineSpec.new({'name' => @vm_name}, chef_server)
|
140
|
+
# machine_spec.location = { 'driver_url' => driver.driver_url,
|
141
|
+
# 'server_id' => @server_id}
|
142
|
+
# driver.destroy_machine(action_handler, machine_spec, @metal_config[:machine_options])
|
143
|
+
# end
|
144
|
+
# vm = find_vm_by_id(@server_id, @connection)
|
145
|
+
# expect(vm).to eq(nil)
|
146
|
+
# end
|
147
|
+
# end
|
148
148
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: clc-chef-metal-vsphere
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.3.
|
4
|
+
version: 0.3.49
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- CenturyLink Cloud
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-08-
|
11
|
+
date: 2014-08-27 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: chef
|