joyent-provisioner 1.1.1 → 1.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/joyent-provisioner.gemspec +2 -2
  3. data/lib/provisioner/command/bootstrap.rb +1 -1
  4. data/lib/provisioner/host_ip.rb +3 -1
  5. data/lib/provisioner/version.rb +1 -1
  6. data/spec/provisioner/command/bootstrap_spec.rb +4 -4
  7. data/spec/provisioner/host_ip_spec.rb +4 -4
  8. metadata +5 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 2cb3bd189052b9f8fef0b9cd476cd6423a053d55
4
- data.tar.gz: 44abcd739a02b9d5e925ff9597529e96bfe3617d
3
+ metadata.gz: b3f8c0cc8fc99bee07f7392a2ecc72b5421c6808
4
+ data.tar.gz: b6a889eb636f5a682e326d7ea5f2012d9cca24bd
5
5
  SHA512:
6
- metadata.gz: fa371e53418e469ed75e7985cd753704e077ee18e06e4f52f69715675fe0df7be4c22754941808ed84dafc6986001663f42983b436b1c1c2243529e094db6872
7
- data.tar.gz: 533beea09e608deda1b8633709c78397f94c40c6cbe3618ace945ab09abc15c956a7274aa01ef937ee9fe04d4abd62b0cb8d37d381ac459793b39961b19b2523
6
+ metadata.gz: 431b25f18353f33d792c3293d465dc3976b4faeb8c22bd9ec726a3842b1551d3deed11a6a2a9b3f3dd6123ff23924da4dd4a3835d030e63f0082c03657e89d2d
7
+ data.tar.gz: 24010645b4a1a480928c4940a419c9b2f8887bbf40a9f04440511bb5670c4a0a816dba47d5514cd5f94bb11cbf7e0e85f5422857673a3e7338ba6c79b33bf1cc
data/joyent-provisioner.gemspec CHANGED
@@ -6,8 +6,8 @@ require 'provisioner/version'
6
6
  Gem::Specification.new do |spec|
7
7
  spec.name = "joyent-provisioner"
8
8
  spec.version = Provisioner::VERSION
9
- spec.authors = ["Konstantin Gredeskoul", "Blake Irvin", "Richard Millan"]
10
- spec.email = ["kigster@gmail.com", "bixu@wanelo.com", "richardiux@gmail.com"]
9
+ spec.authors = ["Konstantin Gredeskoul", "Blake Irvin", "Richard Millan", "James Hart"]
10
+ spec.email = ["kigster@gmail.com", "bixu@wanelo.com", "richardiux@gmail.com", "james@wanelo.com"]
11
11
  spec.description = %q{Wrapper gem around provisioning clusters of servers on Joyent cloud}
12
12
  spec.summary = %q{Wrapper gem around provisioning clusters of servers on Joyent cloud}
13
13
  spec.homepage = ""
data/lib/provisioner/command/bootstrap.rb CHANGED
@@ -39,7 +39,7 @@ module Provisioner
39
39
  bootstrap_command = [
40
40
  'knife bootstrap',
41
41
  ip_for_host,
42
- "--distro #{context.distro}",
42
+ "--bootstrap-template #{context.distro}",
43
43
  "--environment #{context.environment}",
44
44
  "--node-name #{name}",
45
45
  ]
data/lib/provisioner/host_ip.rb CHANGED
@@ -13,8 +13,10 @@ module Provisioner
13
13
  @ips = {}
14
14
  server_list.each do |server|
15
15
  # example line
16
+ # c1cdc4a3-366d-690a-a56f-8c0968a5fb23 twemproxy305.prod running smartmachine g4-highcpu-4G 10.100.18.240 4.00 GB 100 GB
17
+
16
18
  # 4330e738-2bca-ee10-f9a6-e9a1b3fcfdec vpn001.prod running virtualmachine sdc:jpc:ubuntu-12.04:2.4. g3-highcpu-1.75-kvm 9.12.42.172,10.100.114.217 1.75 GB 75 GB
17
- zone, hostname, status, type, image, flavor, ips = server.split(/\s+/).compact
19
+ zone, hostname, status, type, flavor, ips = server.split(/\s+/).compact
18
20
  next if ips.nil?
19
21
  @ips[hostname] = (ips.split(',') || []).first
20
22
  end
data/lib/provisioner/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Provisioner
2
- VERSION = "1.1.1"
2
+ VERSION = "1.2.0"
3
3
  end
data/spec/provisioner/command/bootstrap_spec.rb CHANGED
@@ -29,7 +29,7 @@ describe Provisioner::Command::Bootstrap do
29
29
 
30
30
  let(:expected_bootstrap_command) { [
31
31
  'knife bootstrap 1.2.3.4',
32
- '--distro smartos-base64',
32
+ '--bootstrap-template smartos-base64',
33
33
  '--environment test',
34
34
  '--node-name memcached-sessions001.c1.test',
35
35
  '--run-list role[joyent]',
@@ -47,7 +47,7 @@ describe Provisioner::Command::Bootstrap do
47
47
 
48
48
  let(:expected_bootstrap_command) { [
49
49
  'knife bootstrap 1.2.3.4',
50
- '--distro smartos-base64',
50
+ '--bootstrap-template smartos-base64',
51
51
  '--environment test',
52
52
  '--node-name memcached-sessions001.c1.test',
53
53
  '--run-list role[joyent]',
@@ -65,7 +65,7 @@ describe Provisioner::Command::Bootstrap do
65
65
 
66
66
  let(:expected_bootstrap_command) { [
67
67
  'knife bootstrap 1.2.3.4',
68
- '--distro smartos-base64',
68
+ '--bootstrap-template smartos-base64',
69
69
  '--environment test',
70
70
  '--node-name memcached-sessions001.c1.test',
71
71
  '--run-list role[joyent]',
@@ -84,7 +84,7 @@ describe Provisioner::Command::Bootstrap do
84
84
 
85
85
  let(:expected_bootstrap_command) { [
86
86
  'knife bootstrap 1.2.3.4',
87
- '--distro smartos-base64',
87
+ '--bootstrap-template smartos-base64',
88
88
  '--environment test',
89
89
  '--node-name memcached-sessions001.c1.test',
90
90
  '--run-list role[joyent]',
data/spec/provisioner/host_ip_spec.rb CHANGED
@@ -2,10 +2,10 @@ require 'spec_helper'
2
2
 
3
3
  describe Provisioner::HostIP do
4
4
  describe '.ip_for' do
5
- let(:header) { "ID Name State Type Image Flavor IPs RAM Disk Tags\n" }
6
- let(:server001) { "a67c6340-4bf4-11e3-8f96-0800200c9a66 app001.stage running smartmachine sdc:sdc:base64:13.1.0 g3-highmemory-17.125-smartos 1.1.1.1 17.12 GB 420 GB\n" }
7
- let(:server002) { "eb332d70-4bf4-11e3-8f96-0800200c9a66 app002.stage running smartmachine sdc:sdc:base64:13.1.0 g3-highmemory-17.125-smartos 1.1.1.2 17.12 GB 420 GB\n" }
8
- let(:server003) { "eb332d70-4bf4-11e3-8f96-0800200c9a66 app003.stage running smartmachine sdc:sdc:base64:13.1.0 g3-highmemory-17.125-smartos 1.1.1.3,1.1.1.4 17.12 GB 420 GB\n" }
5
+ let(:header) { "ID Name State Type Flavor IPs RAM Disk Tags\n" }
6
+ let(:server001) { "a67c6340-4bf4-11e3-8f96-0800200c9a66 app001.stage running smartmachine g3-highmemory-17.125-smartos 1.1.1.1 17.12 GB 420 GB\n" }
7
+ let(:server002) { "eb332d70-4bf4-11e3-8f96-0800200c9a66 app002.stage running smartmachine g3-highmemory-17.125-smartos 1.1.1.2 17.12 GB 420 GB\n" }
8
+ let(:server003) { "eb332d70-4bf4-11e3-8f96-0800200c9a66 app003.stage running smartmachine g3-highmemory-17.125-smartos 1.1.1.3,1.1.1.4 17.12 GB 420 GB\n" }
9
9
  let(:servers) { [header, server001, server002, server003].join }
10
10
 
11
11
  before do
metadata CHANGED
@@ -1,16 +1,17 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: joyent-provisioner
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.1
4
+ version: 1.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Konstantin Gredeskoul
8
8
  - Blake Irvin
9
9
  - Richard Millan
10
+ - James Hart
10
11
  autorequire:
11
12
  bindir: bin
12
13
  cert_chain: []
13
- date: 2014-11-14 00:00:00.000000000 Z
14
+ date: 2017-01-11 00:00:00.000000000 Z
14
15
  dependencies:
15
16
  - !ruby/object:Gem::Dependency
16
17
  name: mixlib-cli
@@ -59,6 +60,7 @@ email:
59
60
  - kigster@gmail.com
60
61
  - bixu@wanelo.com
61
62
  - richardiux@gmail.com
63
+ - james@wanelo.com
62
64
  executables:
63
65
  - provisioner
64
66
  extensions: []
@@ -118,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
118
120
  version: '0'
119
121
  requirements: []
120
122
  rubyforge_project:
121
- rubygems_version: 2.2.2
123
+ rubygems_version: 2.5.1
122
124
  signing_key:
123
125
  specification_version: 4
124
126
  summary: Wrapper gem around provisioning clusters of servers on Joyent cloud
@@ -132,4 +134,3 @@ test_files:
132
134
  - spec/provisioner/host_ip_spec.rb
133
135
  - spec/spec_helper.rb
134
136
  - spec/support/aruba.rb
135
- has_rdoc: