Permalink
Browse files

initial vsphere deployment infrastructure

This adds a nfs job, which defaults to 0 instances. The vSphere
infrastructure turns it on.

Also, make fog_connection default to nil so other templates/stubs don't
have to specify it.
  • Loading branch information...
1 parent 35f7229 commit c47d69643269177d1fcd302181e4440a66eb77ed Alex Suraci and Chris Brown committed Sep 30, 2013
Showing with 207 additions and 6 deletions.
  1. +4 −2 generate_deployment_manifest
  2. +186 −0 templates/cf-infrastructure-vsphere.yml
  3. +13 −0 templates/cf-jobs.yml
  4. +4 −4 templates/cf-properties.yml
@@ -6,8 +6,10 @@ infrastructure=$1
shift
-if [ "$infrastructure" != "aws" ] && [ "$infrastructure" != "warden" ]; then
- echo "usage: ./generate_deployment_manifest <aws|warden> [stubs...]"
+if [ "$infrastructure" != "aws" ] && \
+ [ "$infrastructure" != "warden" ] && \
+ [ "$infrastructure" != "vsphere" ] ; then
+ echo "usage: ./generate_deployment_manifest <aws|warden|vsphere> [stubs...]"
exit 1
fi
@@ -0,0 +1,186 @@
+compilation:
+ cloud_properties:
+ ram: 1024
+ disk: 4096
+ cpu: 2
+
+networks: (( merge ))
+
+resource_pools:
+ - name: small_z1
+ cloud_properties:
+ ram: 1024
+ disk: 2048
+ cpu: 1
+
+ - name: small_z2
+ cloud_properties:
+ ram: 1024
+ disk: 2048
+ cpu: 1
+
+ - name: medium_z1
+ cloud_properties:
+ ram: 1024
+ disk: 2048
+ cpu: 1
+
+ - name: medium_z2
+ cloud_properties:
+ ram: 1024
+ disk: 2048
+ cpu: 1
+
+ - name: large_z1
+ cloud_properties:
+ ram: 1024
+ disk: 10240
+ cpu: 1
+
+ - name: large_z2
+ cloud_properties:
+ ram: 1024
+ disk: 10240
+ cpu: 1
+
+ - name: runner_z1
+ cloud_properties:
+ ram: 16384
+ disk: 32768
+ cpu: 2
+
+ - name: runner_z2
+ cloud_properties:
+ ram: 16384
+ disk: 32768
+ cpu: 2
+
+ - name: router_z1
+ cloud_properties:
+ ram: 1024
+ disk: 2048
+ cpu: 1
+
+ - name: router_z2
+ cloud_properties:
+ ram: 1024
+ disk: 2048
+ cpu: 1
+
+
+jobs:
+ - name: logs_z1
+ instances: 1
+ persistent_disk: 8192
+ networks:
+ - name: cf1
+ static_ips: (( static_ips(0) ))
+
+ - name: logs_z2
+ instances: 1
+ persistent_disk: 8192
+ networks:
+ - name: cf2
+ static_ips: (( static_ips(0) ))
+
+ - name: nats_z2
+ instances: 1
+ networks:
+ - name: cf2
+ static_ips: (( static_ips(1) ))
+
+ - name: nfs_z1
+ instances: 1
+ networks:
+ - name: cf1
+ static_ips: (( static_ips(2) ))
+
+ - name: postgres_z1
+ instances: 1
+ networks:
+ - name: cf1
+ static_ips: (( static_ips(32) ))
+
+ - name: router_z1
+ instances: 1
+ networks:
+ - name: cf1
+ static_ips: (( static_ips(5, 6) ))
+
+ - name: router_z2
+ instances: 1
+ networks:
+ - name: cf2
+ static_ips: (( static_ips(5, 6) ))
+
+ - name: loggregator_z1
+ instances: 2
+ networks:
+ - name: cf1
+ static_ips: (( static_ips(21, 22) ))
+
+ - name: loggregator_router_z1
+ instances: 1
+ networks:
+ - name: cf1
+ static_ips: (( static_ips(23) ))
+
+
+properties:
+ domain: (( jobs.router_z1.networks.cf1.static_ips.[0] ".xip.io" ))
+ system_domain: (( domain ))
+ system_domain_organization: pivotal
+
+ ccdb:
+ db_scheme: postgres
+ address: (( properties.databases.address ))
+ port: 5524
+ roles:
+ - tag: admin
+ name: ccadmin
+ password: admin
+ databases:
+ - tag: cc
+ name: ccdb
+ citext: true
+
+ uaadb:
+ db_scheme: postgresql
+ address: (( properties.databases.address ))
+ port: 5524
+ roles:
+ - tag: admin
+ name: uaaadmin
+ password: admin
+ databases:
+ - tag: uaa
+ name: uaadb
+ citext: true
+
+ databases:
+ db_scheme: postgres
+ address: (( jobs.postgres_z1.networks.cf1.static_ips.[0] ))
+ port: 5524
+ roles:
+ - tag: admin
+ name: ccadmin
+ password: admin
+ - tag: admin
+ name: uaaadmin
+ password: admin
+ databases:
+ - tag: cc
+ name: ccdb
+ citext: true
+ - tag: uaa
+ name: uaadb
+ citext: true
+
+ uaa:
+ no_ssl: true
+ catalina_opts: -Xmx768m -XX:MaxPermSize=256m
+
+ login:
+ catalina_opts: -Xmx768m -XX:MaxPermSize=256m
+ protocol: http
+
View
@@ -66,6 +66,15 @@ jobs:
networks: (( meta.networks.z1 ))
syslog_aggregator: (( meta.syslog.z1 ))
+ - name: nfs_z1
+ template: debian_nfs_server
+ instances: 0
+ resource_pool: medium_z1
+ persistent_disk: 102400
+ networks:
+ - name: cf1
+ static_ips: (( merge ))
+
- name: postgres_z1
template: postgres
instances: 0
@@ -287,6 +296,10 @@ properties:
syslog_aggregator: ~
+ nfs_server:
+ address: (( jobs.nfs_z1.networks.cf1.static_ips.[0] || nil ))
+ network: (( networks.cf1.subnets.[0].range ))
+
collector:
use_datadog: true
datadog_api_key: ""
@@ -15,22 +15,22 @@ properties:
resource_pool:
resource_directory_key: (( domain "-cc-resources" ))
- fog_connection: (( merge ))
+ fog_connection: ~
cdn: ~
packages:
app_package_directory_key: (( domain "-cc-packages" ))
- fog_connection: (( merge ))
+ fog_connection: ~
cdn: ~
droplets:
droplet_directory_key: (( domain "-cc-droplets" ))
- fog_connection: (( merge ))
+ fog_connection: ~
cdn: ~
buildpacks:
buildpack_directory_key: (( domain "-cc-buildpacks" ))
- fog_connection: (( merge ))
+ fog_connection: ~
cdn: ~
quota_definitions:

0 comments on commit c47d696

Please sign in to comment.