bosh-cloudfoundry 0.7.0.alpha.1 → 0.7.0.alpha.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 (6) hide show
  1. data/ChangeLog.md +1 -0
  2. data/README.md +1 -1
  3. data/bosh-cloudfoundry.gemspec +1 -1
  4. data/templates/v132/aws/dev/deployment_file.yml.erb +10 -9
  5. data/templates/v132/openstack/dev/deployment_file.yml.erb +10 -9
  6. metadata +2 -2
data/ChangeLog.md CHANGED
@@ -5,6 +5,7 @@
5
5
  `bosh-cloudfoundry` is back, rewritten, and supporting Cloud Foundry v2.
6
6
 
7
7
  ```
8
+ $ gem install bosh-cloudfoundry -v "~> 0.7.0.alpha"
8
9
  $ bosh prepare cf
9
10
  $ bosh create cf --dns mycloud.com --public-ip 1.2.3.4
10
11
  ```
data/README.md CHANGED
@@ -37,7 +37,7 @@ Install via RubyGems:
37
37
 
38
38
  ```
39
39
  $ gem install bosh_cli -v "~> 1.5.0.pre" --source https://s3.amazonaws.com/bosh-jenkins-gems/
40
- $ gem install bosh-cloudfoundry
40
+ $ gem install bosh-cloudfoundry -v "~> 0.7.0.alpha"
41
41
  ```
42
42
 
43
43
  The `bosh_cli` gem is currently only available from S3, rather than RubyGem itself. So it needs to be installed first.
data/bosh-cloudfoundry.gemspec CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  Gem::Specification.new do |spec|
4
4
  spec.name = "bosh-cloudfoundry"
5
- spec.version = "0.7.0.alpha.1"
5
+ spec.version = "0.7.0.alpha.2"
6
6
  spec.authors = ["Dr Nic Williams"]
7
7
  spec.email = ["drnicwilliams@gmail.com"]
8
8
  spec.description = %q{Create & manage Cloud Foundry deployments}
data/templates/v132/aws/dev/deployment_file.yml.erb CHANGED
@@ -24,6 +24,7 @@
24
24
  #
25
25
  # $ bosh diff deployment_file.yml.erb
26
26
  #
27
+ name = find("name")
27
28
  dns = find("properties.cf.dns")
28
29
  ip_addresses = find("properties.cf.ip_addresses")
29
30
  security_group = find("properties.cf.security_group")
@@ -31,7 +32,7 @@ core_size = find("properties.cf.core_size")
31
32
  persistent_disk = find("properties.cf.persistent_disk")
32
33
  common_password = random_string 12, :common
33
34
  -%>
34
- name: <%= find("name") %>
35
+ name: <%= name %>
35
36
  director_uuid: <%= find("director_uuid") %>
36
37
 
37
38
  releases:
@@ -158,7 +159,7 @@ properties:
158
159
  management: default
159
160
 
160
161
  nats:
161
- address: 0.core.default.cf.microbosh
162
+ address: 0.core.default.<%= name %>.microbosh
162
163
  port: 4222
163
164
  user: nats
164
165
  password: <%= common_password %>
@@ -182,10 +183,10 @@ properties:
182
183
 
183
184
  service_lifecycle:
184
185
  serialization_data_server:
185
- - 0.core.default.cf.microbosh
186
+ - 0.core.default.<%= name %>.microbosh
186
187
 
187
188
  syslog_aggregator:
188
- address: 0.core.default.cf.microbosh
189
+ address: 0.core.default.<%= name %>.microbosh
189
190
  port: 54321
190
191
 
191
192
  serialization_data_server:
@@ -201,8 +202,8 @@ properties:
201
202
  use_datadog: false
202
203
 
203
204
  nfs_server:
204
- address: 0.core.default.cf.microbosh
205
- #network: "*.cf.microbosh"
205
+ address: 0.core.default.<%= name %>.microbosh
206
+ #network: "*.<%= name %>.microbosh"
206
207
  #idmapd_domain: iad1
207
208
 
208
209
  debian_nfs_server:
@@ -210,7 +211,7 @@ properties:
210
211
 
211
212
  databases: &databases
212
213
  db_scheme: postgres
213
- address: 0.core.default.cf.microbosh
214
+ address: 0.core.default.<%= name %>.microbosh
214
215
  port: 5524
215
216
  roles:
216
217
  - tag: admin
@@ -229,7 +230,7 @@ properties:
229
230
 
230
231
  ccdb: &ccdb
231
232
  db_scheme: postgres
232
- address: 0.core.default.cf.microbosh
233
+ address: 0.core.default.<%= name %>.microbosh
233
234
  port: 5524
234
235
  roles:
235
236
  - tag: admin
@@ -244,7 +245,7 @@ properties:
244
245
 
245
246
  uaadb:
246
247
  db_scheme: postgresql
247
- address: 0.core.default.cf.microbosh
248
+ address: 0.core.default.<%= name %>.microbosh
248
249
  port: 5524
249
250
  roles:
250
251
  - tag: admin
data/templates/v132/openstack/dev/deployment_file.yml.erb CHANGED
@@ -24,6 +24,7 @@
24
24
  #
25
25
  # $ bosh diff deployment_file.yml.erb
26
26
  #
27
+ name = find("name")
27
28
  dns = find("properties.cf.dns")
28
29
  ip_addresses = find("properties.cf.ip_addresses")
29
30
  security_group = find("properties.cf.security_group")
@@ -31,7 +32,7 @@ core_size = find("properties.cf.core_size")
31
32
  persistent_disk = find("properties.cf.persistent_disk")
32
33
  common_password = random_string 12, :common
33
34
  -%>
34
- name: <%= find("name") %>
35
+ name: <%= name %>
35
36
  director_uuid: <%= find("director_uuid") %>
36
37
 
37
38
  releases:
@@ -158,7 +159,7 @@ properties:
158
159
  management: default
159
160
 
160
161
  nats:
161
- address: 0.core.default.cf.microbosh
162
+ address: 0.core.default.<%= name %>.microbosh
162
163
  port: 4222
163
164
  user: nats
164
165
  password: <%= common_password %>
@@ -182,10 +183,10 @@ properties:
182
183
 
183
184
  service_lifecycle:
184
185
  serialization_data_server:
185
- - 0.core.default.cf.microbosh
186
+ - 0.core.default.<%= name %>.microbosh
186
187
 
187
188
  syslog_aggregator:
188
- address: 0.core.default.cf.microbosh
189
+ address: 0.core.default.<%= name %>.microbosh
189
190
  port: 54321
190
191
 
191
192
  serialization_data_server:
@@ -201,8 +202,8 @@ properties:
201
202
  use_datadog: false
202
203
 
203
204
  nfs_server:
204
- address: 0.core.default.cf.microbosh
205
- #network: "*.cf.microbosh"
205
+ address: 0.core.default.<%= name %>.microbosh
206
+ #network: "*.<%= name %>.microbosh"
206
207
  #idmapd_domain: iad1
207
208
 
208
209
  debian_nfs_server:
@@ -210,7 +211,7 @@ properties:
210
211
 
211
212
  databases: &databases
212
213
  db_scheme: postgres
213
- address: 0.core.default.cf.microbosh
214
+ address: 0.core.default.<%= name %>.microbosh
214
215
  port: 5524
215
216
  roles:
216
217
  - tag: admin
@@ -229,7 +230,7 @@ properties:
229
230
 
230
231
  ccdb: &ccdb
231
232
  db_scheme: postgres
232
- address: 0.core.default.cf.microbosh
233
+ address: 0.core.default.<%= name %>.microbosh
233
234
  port: 5524
234
235
  roles:
235
236
  - tag: admin
@@ -244,7 +245,7 @@ properties:
244
245
 
245
246
  uaadb:
246
247
  db_scheme: postgresql
247
- address: 0.core.default.cf.microbosh
248
+ address: 0.core.default.<%= name %>.microbosh
248
249
  port: 5524
249
250
  roles:
250
251
  - tag: admin
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bosh-cloudfoundry
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.0.alpha.1
4
+ version: 0.7.0.alpha.2
5
5
  prerelease: 6
6
6
  platform: ruby
7
7
  authors:
@@ -411,7 +411,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
411
411
  version: '0'
412
412
  segments:
413
413
  - 0
414
- hash: 4077998500263272345
414
+ hash: -4235919160106065906
415
415
  required_rubygems_version: !ruby/object:Gem::Requirement
416
416
  none: false
417
417
  requirements: