bosh-bootstrap 0.15.0 → 0.16.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (23) hide show
  1. checksums.yaml +4 -4
  2. data/ChangeLog.md +8 -0
  3. data/README.md +1 -3
  4. data/lib/bosh-bootstrap/cli/commands/deploy.rb +1 -1
  5. data/lib/bosh-bootstrap/microbosh_providers/aws.rb +4 -1
  6. data/lib/bosh-bootstrap/microbosh_providers/vsphere.rb +1 -1
  7. data/lib/bosh-bootstrap/version.rb +1 -1
  8. data/spec/assets/microbosh_yml/micro_bosh.aws_ec2.us-west-2a.yml +3 -1
  9. data/spec/assets/microbosh_yml/micro_bosh.aws_ec2.yml +3 -1
  10. data/spec/assets/microbosh_yml/micro_bosh.aws_vpc.yml +3 -1
  11. data/spec/assets/microbosh_yml/micro_bosh.aws_vpc_recursor.yml +3 -1
  12. data/spec/assets/microbosh_yml/micro_bosh.openstack.boot_from_volume.yml +1 -1
  13. data/spec/assets/microbosh_yml/micro_bosh.openstack.neutron_manual.yml +1 -1
  14. data/spec/assets/microbosh_yml/micro_bosh.openstack.neutron_vip.yml +1 -1
  15. data/spec/assets/microbosh_yml/micro_bosh.openstack.nova_vip.yml +1 -1
  16. data/spec/assets/microbosh_yml/micro_bosh.openstack.with_recursor.yml +1 -1
  17. data/spec/assets/microbosh_yml/micro_bosh.vsphere.yml +2 -2
  18. data/spec/unit/cli/bootstrap_spec.rb +3 -3
  19. data/spec/unit/microbosh_providers/aws_spec.rb +4 -4
  20. data/spec/unit/microbosh_providers/base_spec.rb +2 -2
  21. data/spec/unit/microbosh_providers/openstack_spec.rb +6 -6
  22. data/spec/unit/microbosh_providers/vsphere_spec.rb +2 -2
  23. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: ec9bfaa86ff0d6489f4032bf510a20e2631a8f0e
4
- data.tar.gz: e162324692a5a37959e5274fd32bf9fb2b89b600
3
+ metadata.gz: d04418f738ef980d66fc961e668361f4c15e20da
4
+ data.tar.gz: 6180d1561aa1996f6c55847f87753c13cb19ef0c
5
5
  SHA512:
6
- metadata.gz: 0d7c876a236c07499f60a72efc788a9c9919c9a6be160d4075dca94091a420a8fc982fda17a9dfb5b530930a99662fd52b1b502614ce45b41b81b44c0fae1f2b
7
- data.tar.gz: 77b888965fbce1a2e65a84e9cdb61c38fedec828ddccf9b6132039983530ee6385babe959b85d3b8d8a6b1a904eefb0f142650be5b18ccc57380ccee76f1d981
6
+ metadata.gz: 8ea224103035cfc34fbab6a54f9b8367fe8b07e96e3fec5320871af8e6240caa7b2efb70bb5fe7dc4123e64b2aa1aa8a5d5f63d2345ae635b0006cb9e9fd234e
7
+ data.tar.gz: 03b8bed96d987a2fc74a769227184a92022e84026d835d70cfa150da06bce90eeb6aa6a93554e516a0df5f4c1004424331594dd443121701a48dd9b9d9f917ba
data/ChangeLog.md CHANGED
@@ -8,6 +8,14 @@ gem install bosh-bootstrap
8
8
  bosh-bootstrap deploy
9
9
  ```
10
10
 
11
+ v0.16
12
+ -----
13
+
14
+ - [aws] Enable the resurrector by default
15
+ - Bump the size of the permanent disk on the microbosh from 16GB to 32GB
16
+ - Fix deprecated calls to :should in tests
17
+ - Remove instructions regarding explicit install of fog, as it is no longer necessary
18
+
11
19
  v0.15
12
20
  -----
13
21
 
data/README.md CHANGED
@@ -68,11 +68,9 @@ This bootstrap tool is distributed as a RubyGem for Ruby 1.9+.
68
68
  ```
69
69
  $ ruby -v
70
70
  ruby 1.9.3p385 ...
71
- $ gem install fog bosh-bootstrap
71
+ $ gem install bosh-bootstrap
72
72
  ```
73
73
 
74
- NOTE: the `fog` gem is explicitly installed above to ensure you get a very recent version. It is a manual installation due to version conflicts with `bosh` own dependency on fog.
75
-
76
74
  Usage
77
75
  -----
78
76
 
data/lib/bosh-bootstrap/cli/commands/deploy.rb CHANGED
@@ -72,7 +72,7 @@ class Bosh::Bootstrap::Cli::Commands::Deploy
72
72
  end
73
73
 
74
74
  def perform_microbosh_deploy
75
- settings.set("bosh.persistent_disk", 16 * 1024)
75
+ settings.set("bosh.persistent_disk", 32 * 1024)
76
76
  @microbosh ||= Bosh::Bootstrap::Microbosh.new(settings_dir, microbosh_provider)
77
77
  @microbosh.deploy(settings)
78
78
  end
data/lib/bosh-bootstrap/microbosh_providers/aws.rb CHANGED
@@ -17,7 +17,10 @@ module Bosh::Bootstrap::MicroboshProviders
17
17
  {"agent"=>
18
18
  {"blobstore"=>{"address"=>public_ip},
19
19
  "nats"=>{"address"=>public_ip}},
20
- "properties"=>{"aws_registry"=>{"address"=>public_ip}}}})
20
+ "properties"=>
21
+ {"aws_registry"=>{"address"=>public_ip},
22
+ "hm"=>{"resurrector_enabled" => true}}},
23
+ })
21
24
  if az = settings.exists?("provider.az")
22
25
  data["resources"]["cloud_properties"]["availability_zone"] = az
23
26
  end
data/lib/bosh-bootstrap/microbosh_providers/vsphere.rb CHANGED
@@ -44,7 +44,7 @@ module Bosh::Bootstrap::MicroboshProviders
44
44
  end
45
45
 
46
46
  # resources:
47
- # persistent_disk: 16384
47
+ # persistent_disk: 32768
48
48
  # cloud_properties:
49
49
  # ram: 4096
50
50
  # disk: 10240
data/lib/bosh-bootstrap/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module Bootstrap
3
- VERSION = "0.15.0"
3
+ VERSION = "0.16.0"
4
4
  end
5
5
  end
data/spec/assets/microbosh_yml/micro_bosh.aws_ec2.us-west-2a.yml CHANGED
@@ -6,7 +6,7 @@ network:
6
6
  type: dynamic
7
7
  vip: 1.2.3.4
8
8
  resources:
9
- persistent_disk: 16384
9
+ persistent_disk: 32768
10
10
  cloud_properties:
11
11
  instance_type: m1.medium
12
12
  availability_zone: us-west-2a
@@ -31,5 +31,7 @@ apply_spec:
31
31
  nats:
32
32
  address: 1.2.3.4
33
33
  properties:
34
+ hm:
35
+ resurrector_enabled: true
34
36
  aws_registry:
35
37
  address: 1.2.3.4
data/spec/assets/microbosh_yml/micro_bosh.aws_ec2.yml CHANGED
@@ -6,7 +6,7 @@ network:
6
6
  type: dynamic
7
7
  vip: 1.2.3.4
8
8
  resources:
9
- persistent_disk: 16384
9
+ persistent_disk: 32768
10
10
  cloud_properties:
11
11
  instance_type: m1.medium
12
12
  cloud:
@@ -30,5 +30,7 @@ apply_spec:
30
30
  nats:
31
31
  address: 1.2.3.4
32
32
  properties:
33
+ hm:
34
+ resurrector_enabled: true
33
35
  aws_registry:
34
36
  address: 1.2.3.4
data/spec/assets/microbosh_yml/micro_bosh.aws_vpc.yml CHANGED
@@ -10,7 +10,7 @@ network:
10
10
  cloud_properties:
11
11
  subnet: subnet-123456
12
12
  resources:
13
- persistent_disk: 16384
13
+ persistent_disk: 32768
14
14
  cloud_properties:
15
15
  instance_type: m1.medium
16
16
  cloud:
@@ -34,6 +34,8 @@ apply_spec:
34
34
  nats:
35
35
  address: 1.2.3.4
36
36
  properties:
37
+ hm:
38
+ resurrector_enabled: true
37
39
  aws_registry:
38
40
  address: 1.2.3.4
39
41
  dns:
data/spec/assets/microbosh_yml/micro_bosh.aws_vpc_recursor.yml CHANGED
@@ -10,7 +10,7 @@ network:
10
10
  cloud_properties:
11
11
  subnet: subnet-123456
12
12
  resources:
13
- persistent_disk: 16384
13
+ persistent_disk: 32768
14
14
  cloud_properties:
15
15
  instance_type: m1.medium
16
16
  cloud:
@@ -34,6 +34,8 @@ apply_spec:
34
34
  nats:
35
35
  address: 1.2.3.4
36
36
  properties:
37
+ hm:
38
+ resurrector_enabled: true
37
39
  aws_registry:
38
40
  address: 1.2.3.4
39
41
  dns:
data/spec/assets/microbosh_yml/micro_bosh.openstack.boot_from_volume.yml CHANGED
@@ -8,7 +8,7 @@ network:
8
8
  cloud_properties:
9
9
  net_id: 7b8788eb-b49e-4424-9065-75a6b07094ea
10
10
  resources:
11
- persistent_disk: 16384
11
+ persistent_disk: 32768
12
12
  cloud_properties:
13
13
  instance_type: m1.medium
14
14
  cloud:
data/spec/assets/microbosh_yml/micro_bosh.openstack.neutron_manual.yml CHANGED
@@ -8,7 +8,7 @@ network:
8
8
  cloud_properties:
9
9
  net_id: 7b8788eb-b49e-4424-9065-75a6b07094ea
10
10
  resources:
11
- persistent_disk: 16384
11
+ persistent_disk: 32768
12
12
  cloud_properties:
13
13
  instance_type: m1.medium
14
14
  cloud:
data/spec/assets/microbosh_yml/micro_bosh.openstack.neutron_vip.yml CHANGED
@@ -8,7 +8,7 @@ network:
8
8
  cloud_properties:
9
9
  net_id: 7b8788eb-b49e-4424-9065-75a6b07094ea
10
10
  resources:
11
- persistent_disk: 16384
11
+ persistent_disk: 32768
12
12
  cloud_properties:
13
13
  instance_type: m1.medium
14
14
  cloud:
data/spec/assets/microbosh_yml/micro_bosh.openstack.nova_vip.yml CHANGED
@@ -6,7 +6,7 @@ network:
6
6
  type: dynamic
7
7
  vip: 1.2.3.4
8
8
  resources:
9
- persistent_disk: 16384
9
+ persistent_disk: 32768
10
10
  cloud_properties:
11
11
  instance_type: m1.medium
12
12
  cloud:
data/spec/assets/microbosh_yml/micro_bosh.openstack.with_recursor.yml CHANGED
@@ -8,7 +8,7 @@ network:
8
8
  cloud_properties:
9
9
  net_id: 7b8788eb-b49e-4424-9065-75a6b07094ea
10
10
  resources:
11
- persistent_disk: 16384
11
+ persistent_disk: 32768
12
12
  cloud_properties:
13
13
  instance_type: m1.medium
14
14
  cloud:
data/spec/assets/microbosh_yml/micro_bosh.vsphere.yml CHANGED
@@ -12,10 +12,10 @@ network:
12
12
  cloud_properties:
13
13
  name: VLAN2194
14
14
  resources:
15
- persistent_disk: "16384"
15
+ persistent_disk: "32768"
16
16
  cloud_properties:
17
17
  ram: "2048"
18
- disk: "16384"
18
+ disk: "32768"
19
19
  cpu: "2"
20
20
  cloud:
21
21
  plugin: vsphere
data/spec/unit/cli/bootstrap_spec.rb CHANGED
@@ -27,21 +27,21 @@ begin
27
27
  it "runs deploy command" do
28
28
  cmd = double(Bosh::Bootstrap::Cli::Commands::Deploy)
29
29
  expect(cmd).to receive(:perform)
30
- Bosh::Bootstrap::Cli::Commands::Deploy.stub(:new).and_return(cmd)
30
+ allow(Bosh::Bootstrap::Cli::Commands::Deploy).to receive(:new).and_return(cmd)
31
31
  cli.deploy
32
32
  end
33
33
 
34
34
  it "runs delete command" do
35
35
  cmd = double(Bosh::Bootstrap::Cli::Commands::Delete)
36
36
  expect(cmd).to receive(:perform)
37
- Bosh::Bootstrap::Cli::Commands::Delete.stub(:new).and_return(cmd)
37
+ allow(Bosh::Bootstrap::Cli::Commands::Delete).to receive(:new).and_return(cmd)
38
38
  cli.delete
39
39
  end
40
40
 
41
41
  it "runs ssh command" do
42
42
  cmd = double(Bosh::Bootstrap::Cli::Commands::SSH)
43
43
  expect(cmd).to receive(:perform)
44
- Bosh::Bootstrap::Cli::Commands::SSH.stub(:new).and_return(cmd)
44
+ allow(Bosh::Bootstrap::Cli::Commands::SSH).to receive(:new).and_return(cmd)
45
45
  cli.ssh
46
46
  end
47
47
  end
data/spec/unit/microbosh_providers/aws_spec.rb CHANGED
@@ -19,7 +19,7 @@ describe Bosh::Bootstrap::MicroboshProviders::AWS do
19
19
  setting "key_pair.path", "~/.microbosh/ssh/test-bosh"
20
20
  setting "bosh.name", "test-bosh"
21
21
  setting "bosh.salted_password", "salted_password"
22
- setting "bosh.persistent_disk", 16384
22
+ setting "bosh.persistent_disk", 32768
23
23
 
24
24
  subject = Bosh::Bootstrap::MicroboshProviders::AWS.new(microbosh_yml, settings, fog_compute)
25
25
 
@@ -38,7 +38,7 @@ describe Bosh::Bootstrap::MicroboshProviders::AWS do
38
38
  setting "key_pair.path", "~/.microbosh/ssh/test-bosh"
39
39
  setting "bosh.name", "test-bosh"
40
40
  setting "bosh.salted_password", "salted_password"
41
- setting "bosh.persistent_disk", 16384
41
+ setting "bosh.persistent_disk", 32768
42
42
 
43
43
  subject = Bosh::Bootstrap::MicroboshProviders::AWS.new(microbosh_yml, settings, fog_compute)
44
44
 
@@ -58,7 +58,7 @@ describe Bosh::Bootstrap::MicroboshProviders::AWS do
58
58
  setting "key_pair.path", "~/.microbosh/ssh/test-bosh"
59
59
  setting "bosh.name", "test-bosh"
60
60
  setting "bosh.salted_password", "salted_password"
61
- setting "bosh.persistent_disk", 16384
61
+ setting "bosh.persistent_disk", 32768
62
62
 
63
63
  subject = Bosh::Bootstrap::MicroboshProviders::AWS.new(microbosh_yml, settings, fog_compute)
64
64
 
@@ -198,7 +198,7 @@ describe Bosh::Bootstrap::MicroboshProviders::AWS do
198
198
  setting "key_pair.path", "~/.microbosh/ssh/test-bosh"
199
199
  setting "bosh.name", "test-bosh"
200
200
  setting "bosh.salted_password", "salted_password"
201
- setting "bosh.persistent_disk", 16384
201
+ setting "bosh.persistent_disk", 32768
202
202
  setting "recursor", "4.5.6.7"
203
203
 
204
204
  subject = Bosh::Bootstrap::MicroboshProviders::AWS.new(microbosh_yml, settings, fog_compute)
data/spec/unit/microbosh_providers/base_spec.rb CHANGED
@@ -18,7 +18,7 @@ describe Bosh::Bootstrap::MicroboshProviders::Base do
18
18
  setting "recursor", "4.5.6.7"
19
19
 
20
20
  subject.create_microbosh_yml(settings)
21
- File.should be_exists(microbosh_yml)
21
+ expect(File).to be_exists(microbosh_yml)
22
22
  yaml_files_match(microbosh_yml, spec_asset("microbosh_yml/micro_bosh.base.with_recursor.yml"))
23
23
  end
24
24
  end
@@ -26,7 +26,7 @@ describe Bosh::Bootstrap::MicroboshProviders::Base do
26
26
  context "when recursor is not provided" do
27
27
  it "does not adds the recursor to the yml" do
28
28
  subject.create_microbosh_yml(settings)
29
- File.should be_exists(microbosh_yml)
29
+ expect(File).to be_exists(microbosh_yml)
30
30
  yaml_files_match(microbosh_yml, spec_asset("microbosh_yml/micro_bosh.base.without_recursor.yml"))
31
31
  end
32
32
  end
data/spec/unit/microbosh_providers/openstack_spec.rb CHANGED
@@ -19,7 +19,7 @@ describe Bosh::Bootstrap::MicroboshProviders::OpenStack do
19
19
  setting "key_pair.path", "~/.microbosh/ssh/test-bosh"
20
20
  setting "bosh.name", "test-bosh"
21
21
  setting "bosh.salted_password", "salted_password"
22
- setting "bosh.persistent_disk", 16384
22
+ setting "bosh.persistent_disk", 32768
23
23
 
24
24
  subject = Bosh::Bootstrap::MicroboshProviders::OpenStack.new(microbosh_yml, settings, fog_compute)
25
25
 
@@ -43,7 +43,7 @@ describe Bosh::Bootstrap::MicroboshProviders::OpenStack do
43
43
  setting "key_pair.path", "~/.microbosh/ssh/test-bosh"
44
44
  setting "bosh.name", "test-bosh"
45
45
  setting "bosh.salted_password", "salted_password"
46
- setting "bosh.persistent_disk", 16384
46
+ setting "bosh.persistent_disk", 32768
47
47
 
48
48
  subject = Bosh::Bootstrap::MicroboshProviders::OpenStack.new(microbosh_yml, settings, fog_compute)
49
49
 
@@ -64,7 +64,7 @@ describe Bosh::Bootstrap::MicroboshProviders::OpenStack do
64
64
  setting "key_pair.path", "~/.microbosh/ssh/test-bosh"
65
65
  setting "bosh.name", "test-bosh"
66
66
  setting "bosh.salted_password", "salted_password"
67
- setting "bosh.persistent_disk", 16384
67
+ setting "bosh.persistent_disk", 32768
68
68
 
69
69
  subject = Bosh::Bootstrap::MicroboshProviders::OpenStack.new(microbosh_yml, settings, fog_compute)
70
70
 
@@ -85,7 +85,7 @@ describe Bosh::Bootstrap::MicroboshProviders::OpenStack do
85
85
  setting "key_pair.path", "~/.microbosh/ssh/test-bosh"
86
86
  setting "bosh.name", "test-bosh"
87
87
  setting "bosh.salted_password", "salted_password"
88
- setting "bosh.persistent_disk", 16384
88
+ setting "bosh.persistent_disk", 32768
89
89
 
90
90
  setting "provider.options.boot_from_volume", true
91
91
 
@@ -109,13 +109,13 @@ describe Bosh::Bootstrap::MicroboshProviders::OpenStack do
109
109
  setting "key_pair.path", "~/.microbosh/ssh/test-bosh"
110
110
  setting "bosh.name", "test-bosh"
111
111
  setting "bosh.salted_password", "salted_password"
112
- setting "bosh.persistent_disk", 16384
112
+ setting "bosh.persistent_disk", 32768
113
113
  setting "recursor", "4.5.6.7"
114
114
 
115
115
  subject = Bosh::Bootstrap::MicroboshProviders::OpenStack.new(microbosh_yml, settings, fog_compute)
116
116
 
117
117
  subject.create_microbosh_yml(settings)
118
- File.should be_exists(microbosh_yml)
118
+ expect(File).to be_exists(microbosh_yml)
119
119
  yaml_files_match(microbosh_yml, spec_asset("microbosh_yml/micro_bosh.openstack.with_recursor.yml"))
120
120
  end
121
121
  end
data/spec/unit/microbosh_providers/vsphere_spec.rb CHANGED
@@ -13,9 +13,9 @@ describe Bosh::Bootstrap::MicroboshProviders::VSphere do
13
13
  setting "provider.credentials.vsphere_username", "user"
14
14
  setting "provider.credentials.vsphere_password", "TempP@ss"
15
15
 
16
- setting "provider.resources.persistent_disk", "16384"
16
+ setting "provider.resources.persistent_disk", "32768"
17
17
  setting "provider.resources.ram", "2048"
18
- setting "provider.resources.disk", "16384"
18
+ setting "provider.resources.disk", "32768"
19
19
  setting "provider.resources.cpu", "2"
20
20
 
21
21
  # TODO - perhaps network.ip_address is better?
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bosh-bootstrap
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.15.0
4
+ version: 0.16.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dr Nic Williams
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-12-19 00:00:00.000000000 Z
11
+ date: 2015-01-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bosh_cli_plugin_micro
@@ -261,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
261
261
  version: '0'
262
262
  requirements: []
263
263
  rubyforge_project:
264
- rubygems_version: 2.4.4
264
+ rubygems_version: 2.4.3
265
265
  signing_key:
266
266
  specification_version: 4
267
267
  summary: bosh-bootstrap configures and deploys a microbosh deployed on either AWS