bosh-cloudfoundry 0.7.0.alpha.1 → 0.7.0.alpha.2

data/ChangeLog.md

@@ -5,6 +5,7 @@
 `bosh-cloudfoundry` is back, rewritten, and supporting Cloud Foundry v2.
 
 ```
+$ gem install bosh-cloudfoundry -v "~> 0.7.0.alpha"
 $ bosh prepare cf
 $ bosh create cf --dns mycloud.com --public-ip 1.2.3.4
 ```

data/README.md

@@ -37,7 +37,7 @@ Install via RubyGems:
 
 ```
 $ gem install bosh_cli -v "~> 1.5.0.pre" --source https://s3.amazonaws.com/bosh-jenkins-gems/ 
-$ gem install bosh-cloudfoundry
+$ gem install bosh-cloudfoundry -v "~> 0.7.0.alpha"
 ```
 
 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

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "bosh-cloudfoundry"
-  spec.version       = "0.7.0.alpha.1"
+  spec.version       = "0.7.0.alpha.2"
   spec.authors       = ["Dr Nic Williams"]
   spec.email         = ["drnicwilliams@gmail.com"]
   spec.description   = %q{Create & manage Cloud Foundry deployments}

data/templates/v132/aws/dev/deployment_file.yml.erb

@@ -24,6 +24,7 @@
 #
 #     $ bosh diff deployment_file.yml.erb
 #
+name            = find("name")
 dns             = find("properties.cf.dns")
 ip_addresses    = find("properties.cf.ip_addresses")
 security_group  = find("properties.cf.security_group")
@@ -31,7 +32,7 @@ core_size       = find("properties.cf.core_size")
 persistent_disk = find("properties.cf.persistent_disk")
 common_password = random_string 12, :common
 -%>
-name: <%= find("name") %>
+name: <%= name %>
 director_uuid: <%= find("director_uuid") %>
 
 releases:
@@ -158,7 +159,7 @@ properties:
     management: default
 
   nats:
-    address: 0.core.default.cf.microbosh
+    address: 0.core.default.<%= name %>.microbosh
     port: 4222
     user: nats
     password: <%= common_password %>
@@ -182,10 +183,10 @@ properties:
 
   service_lifecycle:
     serialization_data_server:
-    - 0.core.default.cf.microbosh
+    - 0.core.default.<%= name %>.microbosh
 
   syslog_aggregator:
-    address: 0.core.default.cf.microbosh
+    address: 0.core.default.<%= name %>.microbosh
     port: 54321
 
   serialization_data_server:
@@ -201,8 +202,8 @@ properties:
     use_datadog: false
 
   nfs_server:
-    address: 0.core.default.cf.microbosh
-    #network: "*.cf.microbosh"
+    address: 0.core.default.<%= name %>.microbosh
+    #network: "*.<%= name %>.microbosh"
     #idmapd_domain: iad1
 
   debian_nfs_server:
@@ -210,7 +211,7 @@ properties:
 
   databases: &databases
     db_scheme: postgres
-    address: 0.core.default.cf.microbosh
+    address: 0.core.default.<%= name %>.microbosh
     port: 5524
     roles:
       - tag: admin
@@ -229,7 +230,7 @@ properties:
 
   ccdb: &ccdb
     db_scheme: postgres
-    address: 0.core.default.cf.microbosh
+    address: 0.core.default.<%= name %>.microbosh
     port: 5524
     roles:
       - tag: admin
@@ -244,7 +245,7 @@ properties:
 
   uaadb: 
     db_scheme: postgresql
-    address: 0.core.default.cf.microbosh
+    address: 0.core.default.<%= name %>.microbosh
     port: 5524
     roles:
       - tag: admin

data/templates/v132/openstack/dev/deployment_file.yml.erb

@@ -24,6 +24,7 @@
 #
 #     $ bosh diff deployment_file.yml.erb
 #
+name            = find("name")
 dns             = find("properties.cf.dns")
 ip_addresses    = find("properties.cf.ip_addresses")
 security_group  = find("properties.cf.security_group")
@@ -31,7 +32,7 @@ core_size       = find("properties.cf.core_size")
 persistent_disk = find("properties.cf.persistent_disk")
 common_password = random_string 12, :common
 -%>
-name: <%= find("name") %>
+name: <%= name %>
 director_uuid: <%= find("director_uuid") %>
 
 releases:
@@ -158,7 +159,7 @@ properties:
     management: default
 
   nats:
-    address: 0.core.default.cf.microbosh
+    address: 0.core.default.<%= name %>.microbosh
     port: 4222
     user: nats
     password: <%= common_password %>
@@ -182,10 +183,10 @@ properties:
 
   service_lifecycle:
     serialization_data_server:
-    - 0.core.default.cf.microbosh
+    - 0.core.default.<%= name %>.microbosh
 
   syslog_aggregator:
-    address: 0.core.default.cf.microbosh
+    address: 0.core.default.<%= name %>.microbosh
     port: 54321
 
   serialization_data_server:
@@ -201,8 +202,8 @@ properties:
     use_datadog: false
 
   nfs_server:
-    address: 0.core.default.cf.microbosh
-    #network: "*.cf.microbosh"
+    address: 0.core.default.<%= name %>.microbosh
+    #network: "*.<%= name %>.microbosh"
     #idmapd_domain: iad1
 
   debian_nfs_server:
@@ -210,7 +211,7 @@ properties:
 
   databases: &databases
     db_scheme: postgres
-    address: 0.core.default.cf.microbosh
+    address: 0.core.default.<%= name %>.microbosh
     port: 5524
     roles:
       - tag: admin
@@ -229,7 +230,7 @@ properties:
 
   ccdb: &ccdb
     db_scheme: postgres
-    address: 0.core.default.cf.microbosh
+    address: 0.core.default.<%= name %>.microbosh
     port: 5524
     roles:
       - tag: admin
@@ -244,7 +245,7 @@ properties:
 
   uaadb: 
     db_scheme: postgresql
-    address: 0.core.default.cf.microbosh
+    address: 0.core.default.<%= name %>.microbosh
     port: 5524
     roles:
       - tag: admin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-cloudfoundry
 version: !ruby/object:Gem::Version
-  version: 0.7.0.alpha.1
+  version: 0.7.0.alpha.2
   prerelease: 6
 platform: ruby
 authors:
@@ -411,7 +411,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4077998500263272345
+      hash: -4235919160106065906
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: