kitchen-joyent 0.1.1 → 0.2.0

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.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +8 -1
  3. data/README.md +27 -1
  4. data/kitchen-joyent.gemspec +7 -7
  5. data/lib/kitchen/driver/joyent.rb +34 -8
  6. data/lib/kitchen/driver/joyent_version.rb +1 -1
  7. data/scripts/install-freebsd.sh +1 -0
  8. data/scripts/install-smartos.sh +4 -3
  9. metadata +28 -26
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 663fcfc15127cb91564b22684c9423f7e804d99c
4
- data.tar.gz: 63aa3638e8eb088a38f7efe01dbd3efd4aa57e11
3
+ metadata.gz: 6cdddcc9d9b8dbc4e5e0cd5122911ad74c6f924c
4
+ data.tar.gz: 8841635f4ff25fa656f24ae1aa6598809c4d6960
5
5
  SHA512:
6
- metadata.gz: a7455b6fae80f8311c8465827116a5a033b40e9240045a4a17fd17e278139d3ca383f89e8981e28fe96a97f054d8ada4e4556c81dc365764c905c0435096434e
7
- data.tar.gz: ce1f9c2028ec7935539b06ca5b62cf141cce85aa434c74a2af55cb9353a4799821c720fd9c5deb7e125063bce056c75f7432d72859ffcd9bcf4b46cc8705a6b6
6
+ metadata.gz: 8240fd9d670c4d3ec0470c9317f79982893e04cb2b313eab4097f07e1db84131e52e8471b459b6436ad7f4df0d5141ddf7c1688a529b0dec1a16bd63a468998f
7
+ data.tar.gz: c759a4aeb60051d8f3f3d6e684b8701a92eaeed6b21dd9809192b2f987eed6e68f9add5a2e67de2de5e5d3ecc5bf8415624e1828a3df1296001224ee494de53c
data/CHANGELOG.md CHANGED
@@ -1,3 +1,10 @@
1
- # 0.1.0 / 2013-05-12
1
+ v0.2.0 (2015-03-02)
2
+ -------------------
3
+ - Allow self-signed certificate on server via joyent_ssl_verify_peer
4
+ - Allow additional networks via joyent_networks
5
+ - Default networks if needed via joyent_default_networks
6
+ - Add instance name via joyent_image_name
2
7
 
8
+ v0.1.0 (2013-05-12)
9
+ -------------------
3
10
  * Initial release
data/README.md CHANGED
@@ -30,7 +30,33 @@ Provide, at a minimum, the required driver options in your `.kitchen.yml` file:
30
30
 
31
31
  Until we get SmartOS, OmniOS, and FreeBSD into Omnitruck, you'll need
32
32
  to override the Chef bootstrap script.
33
- chef_omnibus_url: http://path.to.an.script.sh
33
+ chef_omnibus_url: http://path.to.an.script.sh
34
+
35
+ ## Optional Attributes
36
+ Under `platforms` section:
37
+
38
+ driver_config:
39
+ # Allow self-signed certs.
40
+ #
41
+ joyent_ssl_verify_peer: false
42
+
43
+ # For additional nics
44
+ #
45
+ joyent_networks:
46
+ - d2ba0f30-bbe8-11e2-a9a2-6bc116856d85
47
+ - a3a84a44-766c-407e-9233-9a45ebcd579f
48
+
49
+ # For images without a default network (will throw error if invalid)
50
+ # NOTE: Don't use 'joyent_networks' if using this attribute.
51
+ #
52
+ joyent_default_networks:
53
+ - d2ba0f30-bbe8-11e2-a9a2-6bc116856d85
54
+ - a3a84a44-766c-407e-9233-9a45ebcd579f
55
+
56
+ Under `suites` section:
57
+
58
+ driver_config:
59
+ joyent_image_name: default01
34
60
 
35
61
  # Example .kitchen.yml
36
62
 
data/kitchen-joyent.gemspec CHANGED
@@ -18,12 +18,12 @@ Gem::Specification.new do |spec|
18
18
  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
19
19
  spec.require_paths = ['lib']
20
20
 
21
- spec.add_dependency 'test-kitchen', '~> 1.0'
22
- spec.add_dependency 'fog'
21
+ spec.add_dependency 'test-kitchen', '~> 1.3'
22
+ spec.add_dependency 'fog', '~> 1.28'
23
23
 
24
- spec.add_development_dependency 'rubocop'
25
- spec.add_development_dependency 'rake'
26
- spec.add_development_dependency 'cane'
27
- spec.add_development_dependency 'countloc'
28
- spec.add_development_dependency 'rspec'
24
+ spec.add_development_dependency 'rubocop', '~> 0'
25
+ spec.add_development_dependency 'rake', '~> 0'
26
+ spec.add_development_dependency 'cane', '~> 0'
27
+ spec.add_development_dependency 'countloc', '~> 0'
28
+ spec.add_development_dependency 'rspec', '~> 0'
29
29
  end
data/lib/kitchen/driver/joyent.rb CHANGED
@@ -30,7 +30,11 @@ module Kitchen
30
30
  class Joyent < Kitchen::Driver::SSHBase
31
31
  default_config :joyent_url, 'https://us-sw-1.api.joyentcloud.com'
32
32
  default_config :joyent_image_id, '87b9f4ac-5385-11e3-a304-fb868b82fe10'
33
+ default_config :joyent_image_name, ''
33
34
  default_config :joyent_flavor_id, 'g3-standard-4-smartos'
35
+ default_config :joyent_networks, []
36
+ default_config :joyent_default_networks, []
37
+ default_config :joyent_ssl_verify_peer, true
34
38
  default_config :username, 'root'
35
39
  default_config :port, '22'
36
40
  default_config :sudo, false
@@ -66,11 +70,14 @@ module Kitchen
66
70
  debug_compute_config
67
71
 
68
72
  server_def = {
69
- provider: :joyent,
70
- joyent_username: config[:joyent_username],
71
- joyent_keyname: config[:joyent_keyname],
72
- joyent_keyfile: config[:joyent_keyfile],
73
- joyent_url: config[:joyent_url],
73
+ provider: :joyent,
74
+ joyent_username: config[:joyent_username],
75
+ joyent_keyname: config[:joyent_keyname],
76
+ joyent_keyfile: config[:joyent_keyfile],
77
+ joyent_url: config[:joyent_url],
78
+ connection_options: {
79
+ ssl_verify_peer: config[:joyent_ssl_verify_peer],
80
+ },
74
81
  }
75
82
 
76
83
  Fog::Compute.new(server_def)
@@ -78,17 +85,36 @@ module Kitchen
78
85
 
79
86
  def create_server
80
87
  debug_server_config
81
-
82
- compute.servers.create(
88
+
89
+ compute_def = {
83
90
  dataset: config[:joyent_image_id],
84
91
  package: config[:joyent_flavor_id],
85
- )
92
+ name: config[:joyent_image_name],
93
+ }
94
+
95
+ if config[:joyent_networks].any?
96
+ compute_def[:networks] = config[:joyent_networks]
97
+ elsif config[:joyent_default_networks].any?
98
+ compute_def[:default_networks] = config[:joyent_default_networks]
99
+ end
100
+
101
+ compute.servers.create(compute_def)
86
102
  end
87
103
 
88
104
  def debug_server_config
89
105
  debug("joyent: joyent_url #{config[:joyent_url]}")
90
106
  debug("joyent: image_id #{config[:joyent_image_id]}")
91
107
  debug("joyent: flavor_id #{config[:joyent_flavor_id]}")
108
+
109
+ unless config[:joyent_image_name].length == 0
110
+ debug("joyent: image_name #{config[:joyent_image_name]}")
111
+ end
112
+ if config[:joyent_networks].any?
113
+ debug("joyent: networks #{config[:joyent_networks]}")
114
+ end
115
+ if config[:joyent_default_networks].any?
116
+ debug("joyent: default_networks #{config[:joyent_networks]}")
117
+ end
92
118
  end
93
119
 
94
120
  def debug_compute_config
data/lib/kitchen/driver/joyent_version.rb CHANGED
@@ -20,6 +20,6 @@ module Kitchen
20
20
  # Kitchen
21
21
  module Driver
22
22
  # Version string for Joyent Kitchen provider
23
- JOYENT_VERSION = '0.1.1'
23
+ JOYENT_VERSION = '0.2.0'
24
24
  end
25
25
  end
data/scripts/install-freebsd.sh ADDED
@@ -0,0 +1 @@
1
+ echo "LALALALALALALALALALALALA"
data/scripts/install-smartos.sh CHANGED
@@ -1,4 +1,5 @@
1
- pkgin -y install ruby193
2
- pkgin -y install gcc47
1
+ pkgin -y install ruby-2.1.4
2
+ pkgin -y install gcc49
3
3
  pkgin -y install gmake
4
- gem install chef --version 11.10.0 --no-ri --no-rdoc
4
+ gem install chef --version 11.16.4 --no-ri --no-rdoc
5
+ gem install builder --no-ri --no-rdoc
metadata CHANGED
@@ -1,111 +1,111 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: kitchen-joyent
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.1
4
+ version: 0.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean OMeara
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-02-21 00:00:00.000000000 Z
11
+ date: 2015-03-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: test-kitchen
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ~>
17
+ - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '1.0'
19
+ version: '1.3'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ~>
24
+ - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: '1.0'
26
+ version: '1.3'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: fog
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - '>='
31
+ - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: '0'
33
+ version: '1.28'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - '>='
38
+ - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: '0'
40
+ version: '1.28'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: rubocop
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - '>='
45
+ - - "~>"
46
46
  - !ruby/object:Gem::Version
47
47
  version: '0'
48
48
  type: :development
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - '>='
52
+ - - "~>"
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: rake
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - '>='
59
+ - - "~>"
60
60
  - !ruby/object:Gem::Version
61
61
  version: '0'
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - '>='
66
+ - - "~>"
67
67
  - !ruby/object:Gem::Version
68
68
  version: '0'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: cane
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - '>='
73
+ - - "~>"
74
74
  - !ruby/object:Gem::Version
75
75
  version: '0'
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - '>='
80
+ - - "~>"
81
81
  - !ruby/object:Gem::Version
82
82
  version: '0'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: countloc
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - '>='
87
+ - - "~>"
88
88
  - !ruby/object:Gem::Version
89
89
  version: '0'
90
90
  type: :development
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - '>='
94
+ - - "~>"
95
95
  - !ruby/object:Gem::Version
96
96
  version: '0'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: rspec
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - '>='
101
+ - - "~>"
102
102
  - !ruby/object:Gem::Version
103
103
  version: '0'
104
104
  type: :development
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - '>='
108
+ - - "~>"
109
109
  - !ruby/object:Gem::Version
110
110
  version: '0'
111
111
  description: A Test Kitchen Joyent driver
@@ -115,9 +115,9 @@ executables: []
115
115
  extensions: []
116
116
  extra_rdoc_files: []
117
117
  files:
118
- - .gitignore
119
- - .rubocop.yml
120
- - .travis.yml
118
+ - ".gitignore"
119
+ - ".rubocop.yml"
120
+ - ".travis.yml"
121
121
  - CHANGELOG.md
122
122
  - Gemfile
123
123
  - LICENSE.txt
@@ -126,6 +126,7 @@ files:
126
126
  - kitchen-joyent.gemspec
127
127
  - lib/kitchen/driver/joyent.rb
128
128
  - lib/kitchen/driver/joyent_version.rb
129
+ - scripts/install-freebsd.sh
129
130
  - scripts/install-smartos.sh
130
131
  - spec/kitchen/driver/joyent_spec.rb
131
132
  - spec/spec_helper.rb
@@ -139,20 +140,21 @@ require_paths:
139
140
  - lib
140
141
  required_ruby_version: !ruby/object:Gem::Requirement
141
142
  requirements:
142
- - - '>='
143
+ - - ">="
143
144
  - !ruby/object:Gem::Version
144
145
  version: '0'
145
146
  required_rubygems_version: !ruby/object:Gem::Requirement
146
147
  requirements:
147
- - - '>='
148
+ - - ">="
148
149
  - !ruby/object:Gem::Version
149
150
  version: '0'
150
151
  requirements: []
151
152
  rubyforge_project:
152
- rubygems_version: 2.0.14
153
+ rubygems_version: 2.4.4
153
154
  signing_key:
154
155
  specification_version: 4
155
156
  summary: A Test Kitchen Joyent driver
156
157
  test_files:
157
158
  - spec/kitchen/driver/joyent_spec.rb
158
159
  - spec/spec_helper.rb
160
+ has_rdoc: