kitchen-cloudstack 0.20.3 → 0.20.4

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: ee4d465613811dd5d90ac237c6dedd0c6244af0b
4
- data.tar.gz: 2e8787096938b70798dc267c0efa47e06d4701bf
3
+ metadata.gz: ddef39cb8309e0affd206a10630c35e33ce5bd43
4
+ data.tar.gz: 67a0f80ef2fd65cb78dd3df31c07606f2008241d
5
5
  SHA512:
6
- metadata.gz: dc30e3effe7036cd5a5cd47c3842535cff1691d643694e76d981c531af0c6a1f9745a830ffd5822bbc1afc1b4ac5e99d0e61d8eb6f3fea0555e55dcb9a0aba2a
7
- data.tar.gz: 01535d54ad3e924f5f192cb3d70c5fa704560948c2347f7fa1920d9e25e4df903da16f6555bcaed417f1497bf81577d327e904840e01269d3ebd889de279e6e0
6
+ metadata.gz: 3dc3be63c98d84cb2b4ef9d7e5453bfe467cc4178d341c95316399259199ce10672e6f78be6ade1c0ab15251259f7c3e7ba0ef48429e572cd177a7b1ed5ca3aa
7
+ data.tar.gz: 86f2209bb78208abb88dce712477039e8fc09b81e05a7d002e6ac938c1be00752220c027b4aab9899038500860ef17af7119a6f11e3a4d9b379c09f85610e484
data/README.md CHANGED
@@ -53,6 +53,11 @@ behavior can be overridden with additional options (e.g., to specify a SSH priva
53
53
  username: [SSH USER]
54
54
  port: [SSH PORT]
55
55
 
56
+ host_name setting is useful if you are facing ENAMETOOLONG exceptions in the
57
+ chef run caused by long generated hostnames)
58
+
59
+ host_name: [A UNIQUE HOST NAME]
60
+
56
61
  Only disable SSL cert validation if you absolutely know what you are doing,
57
62
  but are stuck with an CloudStack deployment without valid SSL certs.
58
63
 
data/Rakefile CHANGED
@@ -1,21 +1,21 @@
1
- require "bundler/gem_tasks"
1
+ require 'bundler/gem_tasks'
2
2
  require 'cane/rake_task'
3
3
  require 'tailor/rake_task'
4
4
 
5
- desc "Run cane to check quality metrics"
5
+ desc 'Run cane to check quality metrics'
6
6
  Cane::RakeTask.new do |cane|
7
7
  cane.canefile = './.cane'
8
8
  end
9
9
 
10
10
  Tailor::RakeTask.new
11
11
 
12
- desc "Display LOC stats"
12
+ desc 'Display LOC stats'
13
13
  task :stats do
14
14
  puts "\n## Production Code Stats"
15
- sh "countloc -r lib"
15
+ sh 'countloc -r lib'
16
16
  end
17
17
 
18
- desc "Run all quality tasks"
18
+ desc 'Run all quality tasks'
19
19
  task :quality => [:cane, :tailor, :stats]
20
20
 
21
21
  task :default => [:quality]
@@ -50,23 +50,15 @@ module Kitchen
50
50
  options = {}
51
51
 
52
52
  config[:server_name] ||= generate_name(instance.name)
53
- options['displayname'] = config[:server_name]
54
-
55
- if config[:cloudstack_network_id]
56
- options['networkids'] = config[:cloudstack_network_id]
57
- end
58
53
 
59
- if config[:cloudstack_security_group_id]
60
- options['securitygroupids'] = config[:cloudstack_security_group_id]
61
- end
62
-
63
- if config[:cloudstack_ssh_keypair_name]
64
- options['keypair'] = config[:cloudstack_ssh_keypair_name]
65
- end
54
+ options['displayname'] = config[:server_name]
55
+ options['networkids'] = config[:cloudstack_network_id]
56
+ options['securitygroupids'] = config[:cloudstack_security_group_id]
57
+ options['keypair'] = config[:cloudstack_ssh_keypair_name]
58
+ options['diskofferingid'] = config[:cloudstack_diskoffering_id]
59
+ options['name'] = config[:host_name]
66
60
 
67
- if config[:cloudstack_diskoffering_id]
68
- options['diskofferingid'] = config[:cloudstack_diskoffering_id]
69
- end
61
+ options = sanitize(options)
70
62
 
71
63
  options[:templateid] = config[:cloudstack_template_id]
72
64
  options[:serviceofferingid] = config[:cloudstack_serviceoffering_id]
@@ -282,6 +274,12 @@ module Kitchen
282
274
  end
283
275
  pieces.join sep
284
276
  end
277
+
278
+ private
279
+
280
+ def sanitize(options)
281
+ options.reject { |k, v| v.nil? }
282
+ end
285
283
  end
286
284
  end
287
285
  end
@@ -21,6 +21,6 @@ module Kitchen
21
21
  module Driver
22
22
 
23
23
  # Version string for Cloudstack Kitchen driver
24
- CLOUDSTACK_VERSION = "0.20.3"
24
+ CLOUDSTACK_VERSION = "0.20.4"
25
25
  end
26
26
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: kitchen-cloudstack
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.20.3
4
+ version: 0.20.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jeff Moody
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-06-29 00:00:00.000000000 Z
11
+ date: 2015-08-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: test-kitchen
@@ -173,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
173
173
  version: '0'
174
174
  requirements: []
175
175
  rubyforge_project:
176
- rubygems_version: 2.4.6
176
+ rubygems_version: 2.2.2
177
177
  signing_key:
178
178
  specification_version: 4
179
179
  summary: Provides an interface for Test Kitchen to be able to run jobs against an