bosh-bootstrap 0.16.1 → 0.16.2

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 (12) hide show
  1. checksums.yaml +4 -4
  2. data/ChangeLog.md +1 -0
  3. data/lib/bosh-bootstrap/microbosh_providers/openstack.rb +5 -0
  4. data/lib/bosh-bootstrap/version.rb +1 -1
  5. data/spec/assets/microbosh_yml/micro_bosh.openstack.boot_from_volume.yml +1 -0
  6. data/spec/assets/microbosh_yml/micro_bosh.openstack.neutron_manual.yml +1 -0
  7. data/spec/assets/microbosh_yml/micro_bosh.openstack.neutron_vip.yml +1 -0
  8. data/spec/assets/microbosh_yml/micro_bosh.openstack.nova_vip.yml +1 -0
  9. data/spec/assets/microbosh_yml/micro_bosh.openstack.with_recursor.yml +1 -0
  10. data/spec/assets/microbosh_yml/micro_bosh.openstack.with_state_timeout.yml +46 -0
  11. data/spec/unit/microbosh_providers/openstack_spec.rb +22 -1
  12. metadata +5 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a4eba607b693ee3ccfdfcaa422bd1882de58bca2
4
- data.tar.gz: 205d3080fadcf3f624b8b7f521b5edef9554d9a3
3
+ metadata.gz: a81aa52564889a1fe88d7a9fa76ec7f661f53b82
4
+ data.tar.gz: 557b84880d0ab89f0e2eb755d8ab85b80cc3ca9e
5
5
  SHA512:
6
- metadata.gz: 932a08b017bf9519d73afb69184ca5e2f3b2b2b9ee91048f417b78a52df707138f34a66f9f65bc3397d3626d899ed51227cdf4cb996c9c4ed8b1170c55e4fb25
7
- data.tar.gz: 515ad8d136c3e9ce2bdb409e914b06faa6c7de62042ff46db468d9eaba5987f7d2ed7bda205883a3af35b1ce6c1608f2f262b64764799e7a9daed03f254d7100
6
+ metadata.gz: 5cb25f25864e01349141bcaa11e4b181508ffe2071cae5532ef22d2505e38d589b4c206be6a413c12a5a45d962ef2acaae2838f4bf64c890baf3c3a9c464f254
7
+ data.tar.gz: b08b2b681be847922104e5f17d0ec62b502fa69658542a20c50d1e9a582957d30caa4b3cd17455256ad65e662e0675ab9b1f4107505929acc3e84f35a68fbb29
data/ChangeLog.md CHANGED
@@ -16,6 +16,7 @@ v0.16
16
16
  - Fix deprecated calls to :should in tests
17
17
  - Remove instructions regarding explicit install of fog, as it is no longer necessary
18
18
  - Require cyoi 0.11.3 for a bug fix regarding microbosh security groups [v0.16.1]
19
+ - Allow openstack state timeout to be configurable
19
20
 
20
21
  v0.15
21
22
  -----
data/lib/bosh-bootstrap/microbosh_providers/openstack.rb CHANGED
@@ -87,6 +87,10 @@ module Bosh::Bootstrap::MicroboshProviders
87
87
  {"instance_type"=>"m1.medium"}
88
88
  end
89
89
 
90
+ def provider_state_timeout
91
+ settings.exists?("provider") && settings.provider.exists?("state_timeout") ? settings.provider.state_timeout : 300
92
+ end
93
+
90
94
  def cloud_properties
91
95
  {
92
96
  "auth_url"=>settings.provider.credentials.openstack_auth_url,
@@ -96,6 +100,7 @@ module Bosh::Bootstrap::MicroboshProviders
96
100
  "region"=>region,
97
101
  "default_security_groups"=>security_groups,
98
102
  "default_key_name"=>microbosh_name,
103
+ "state_timeout"=>provider_state_timeout,
99
104
  "private_key"=>private_key_path,
100
105
  # TODO: Only ignore SSL verification if requested by user
101
106
  "connection_options"=>{
data/lib/bosh-bootstrap/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module Bootstrap
3
- VERSION = "0.16.1"
3
+ VERSION = "0.16.2"
4
4
  end
5
5
  end
data/spec/assets/microbosh_yml/micro_bosh.openstack.boot_from_volume.yml CHANGED
@@ -25,6 +25,7 @@ cloud:
25
25
  - dns-server
26
26
  - bosh
27
27
  default_key_name: test-bosh
28
+ state_timeout: 300
28
29
  private_key: ~/.microbosh/ssh/test-bosh
29
30
  connection_options:
30
31
  ssl_verify_peer: false
data/spec/assets/microbosh_yml/micro_bosh.openstack.neutron_manual.yml CHANGED
@@ -25,6 +25,7 @@ cloud:
25
25
  - dns-server
26
26
  - bosh
27
27
  default_key_name: test-bosh
28
+ state_timeout: 300
28
29
  private_key: ~/.microbosh/ssh/test-bosh
29
30
  connection_options:
30
31
  ssl_verify_peer: false
data/spec/assets/microbosh_yml/micro_bosh.openstack.neutron_vip.yml CHANGED
@@ -25,6 +25,7 @@ cloud:
25
25
  - dns-server
26
26
  - bosh
27
27
  default_key_name: test-bosh
28
+ state_timeout: 300
28
29
  private_key: ~/.microbosh/ssh/test-bosh
29
30
  connection_options:
30
31
  ssl_verify_peer: false
data/spec/assets/microbosh_yml/micro_bosh.openstack.nova_vip.yml CHANGED
@@ -23,6 +23,7 @@ cloud:
23
23
  - dns-server
24
24
  - bosh
25
25
  default_key_name: test-bosh
26
+ state_timeout: 300
26
27
  private_key: ~/.microbosh/ssh/test-bosh
27
28
  connection_options:
28
29
  ssl_verify_peer: false
data/spec/assets/microbosh_yml/micro_bosh.openstack.with_recursor.yml CHANGED
@@ -25,6 +25,7 @@ cloud:
25
25
  - dns-server
26
26
  - bosh
27
27
  default_key_name: test-bosh
28
+ state_timeout: 300
28
29
  private_key: ~/.microbosh/ssh/test-bosh
29
30
  connection_options:
30
31
  ssl_verify_peer: false
data/spec/assets/microbosh_yml/micro_bosh.openstack.with_state_timeout.yml ADDED
@@ -0,0 +1,46 @@
1
+ ---
2
+ name: test-bosh
3
+ logging:
4
+ level: DEBUG
5
+ network:
6
+ type: dynamic
7
+ vip: 1.2.3.4
8
+ cloud_properties:
9
+ net_id: 7b8788eb-b49e-4424-9065-75a6b07094ea
10
+ resources:
11
+ persistent_disk: 32768
12
+ cloud_properties:
13
+ instance_type: m1.medium
14
+ cloud:
15
+ plugin: openstack
16
+ properties:
17
+ openstack:
18
+ auth_url: http://10.0.0.2:5000/v2.0/tokens
19
+ username: USER
20
+ api_key: PASSWORD
21
+ tenant: TENANT
22
+ region: REGION
23
+ default_security_groups:
24
+ - ssh
25
+ - dns-server
26
+ - bosh
27
+ default_key_name: test-bosh
28
+ state_timeout: 600
29
+ private_key: ~/.microbosh/ssh/test-bosh
30
+ connection_options:
31
+ ssl_verify_peer: false
32
+ boot_from_volume: false
33
+ apply_spec:
34
+ agent:
35
+ blobstore:
36
+ address: 1.2.3.4
37
+ nats:
38
+ address: 1.2.3.4
39
+ properties:
40
+ director:
41
+ max_threads: 3
42
+ hm:
43
+ resurrector_enabled: true
44
+ ntp:
45
+ - 0.north-america.pool.ntp.org
46
+ - 1.north-america.pool.ntp.org
data/spec/unit/microbosh_providers/openstack_spec.rb CHANGED
@@ -118,6 +118,28 @@ describe Bosh::Bootstrap::MicroboshProviders::OpenStack do
118
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
+
122
+ it "adds state_timeout if provided" do
123
+ setting "provider.name", "openstack"
124
+ setting "provider.credentials.openstack_auth_url", "http://10.0.0.2:5000/v2.0/tokens"
125
+ setting "provider.credentials.openstack_username", "USER"
126
+ setting "provider.credentials.openstack_api_key", "PASSWORD"
127
+ setting "provider.credentials.openstack_tenant", "TENANT"
128
+ setting "provider.credentials.openstack_region", "REGION"
129
+ setting "provider.state_timeout", 600
130
+ setting "address.subnet_id", "7b8788eb-b49e-4424-9065-75a6b07094ea"
131
+ setting "address.pool_name", "INTERNET"
132
+ setting "address.ip", "1.2.3.4" # network.vip
133
+ setting "key_pair.path", "~/.microbosh/ssh/test-bosh"
134
+ setting "bosh.name", "test-bosh"
135
+ setting "bosh.salted_password", "salted_password"
136
+ setting "bosh.persistent_disk", 32768
137
+
138
+ subject = Bosh::Bootstrap::MicroboshProviders::OpenStack.new(microbosh_yml, settings, fog_compute)
139
+ subject.create_microbosh_yml(settings)
140
+ expect(File).to be_exists(microbosh_yml)
141
+ yaml_files_match(microbosh_yml, spec_asset("microbosh_yml/micro_bosh.openstack.with_state_timeout.yml"))
142
+ end
121
143
  end
122
144
 
123
145
  describe "existing stemcells as openstack images" do
@@ -143,5 +165,4 @@ describe Bosh::Bootstrap::MicroboshProviders::OpenStack do
143
165
  expect(subject.find_image_for_stemcell("xxxx", "12345")).to be_nil
144
166
  end
145
167
  end
146
-
147
168
  end
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.16.1
4
+ version: 0.16.2
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: 2015-01-29 00:00:00.000000000 Z
11
+ date: 2015-03-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bosh_cli_plugin_micro
@@ -222,6 +222,7 @@ files:
222
222
  - spec/assets/microbosh_yml/micro_bosh.openstack.neutron_vip.yml
223
223
  - spec/assets/microbosh_yml/micro_bosh.openstack.nova_vip.yml
224
224
  - spec/assets/microbosh_yml/micro_bosh.openstack.with_recursor.yml
225
+ - spec/assets/microbosh_yml/micro_bosh.openstack.with_state_timeout.yml
225
226
  - spec/assets/microbosh_yml/micro_bosh.vsphere.yml
226
227
  - spec/integration/.gitkeep
227
228
  - spec/integration/aws/aws_ec2_basic_spec.rb
@@ -261,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
261
262
  version: '0'
262
263
  requirements: []
263
264
  rubyforge_project:
264
- rubygems_version: 2.2.2
265
+ rubygems_version: 2.4.3
265
266
  signing_key:
266
267
  specification_version: 4
267
268
  summary: bosh-bootstrap configures and deploys a microbosh deployed on either AWS
@@ -279,6 +280,7 @@ test_files:
279
280
  - spec/assets/microbosh_yml/micro_bosh.openstack.neutron_vip.yml
280
281
  - spec/assets/microbosh_yml/micro_bosh.openstack.nova_vip.yml
281
282
  - spec/assets/microbosh_yml/micro_bosh.openstack.with_recursor.yml
283
+ - spec/assets/microbosh_yml/micro_bosh.openstack.with_state_timeout.yml
282
284
  - spec/assets/microbosh_yml/micro_bosh.vsphere.yml
283
285
  - spec/integration/.gitkeep
284
286
  - spec/integration/aws/aws_ec2_basic_spec.rb