Deployment file diff for enabling loggregator (using DNS) (ran: diff production-nfs.yml production-loggregator.yml -u5)

loggregator.yml.diff

--- production-nfs.yml  2013-12-01 01:12:10.292697431 +0000
+++ production-loggregator.yml  2013-12-01 01:12:08.328697435 +0000
@@ -2,11 +2,11 @@
 name: production
 director_uuid: 79ec2271-e0a0-45b4-bb4b-70da40ad4a04
 
 releases:
  - name: cf
-   version: latest
+   version: 147
 
 networks:
 - name: floating
   type: vip
   cloud_properties: {}
@@ -28,10 +28,19 @@
   reuse_compilation_vms: true
   cloud_properties:
     instance_type: m1.small
 
 resource_pools:
+  - name: xsmall
+    network: default
+    size: 3
+    stemcell:
+      name: bosh-openstack-kvm-ubuntu
+      version: latest
+    cloud_properties:
+      instance_type: m1.xsmall
+
   - name: small
     network: default
     size: 4
     stemcell:
       name: bosh-openstack-kvm-ubuntu
@@ -54,11 +63,11 @@
     template:
       - postgres
       - debian_nfs_server
     instances: 1
     resource_pool: small
-    persistent_disk: 4096
+    persistent_disk: 16384
     networks:
     - name: default
       default:
       - dns
       - gateway
@@ -77,10 +86,26 @@
     - name: default
       default:
       - dns
       - gateway
 
+  - name: loggregator
+    template: loggregator
+    instances: 1
+    resource_pool: xsmall
+    networks:
+      - name: default
+
+  - name: trafficcontroller
+    template: loggregator_trafficcontroller
+    instances: 1
+    resource_pool: xsmall
+    networks:
+      - name: default
+    properties:
+      zone: z1
+
   - name: api
     release: cf
     template:
       - cloud_controller_ng
       - gorouter
@@ -89,20 +114,34 @@
     networks:
     - name: default
       default:
       - dns
       - gateway
+    properties:
+      db: databases
+
+  - name: ha_proxy
+    release: cf
+    template:
+      - haproxy
+    instances: 1
+    resource_pool: xsmall
+    networks:
+    - name: default
+      default:
+      - dns
+      - gateway
     - name: floating
       static_ips:
       - 216.174.75.136
-    properties:
-      db: databases
+
 
   - name: dea
     release: cf
     template:
       - dea_next
+      - dea_logging_agent
     instances: 1
     resource_pool: small
     networks:
       - name: default
         default: [dns, gateway]
@@ -116,15 +155,15 @@
     security_group: cf
     persistent_disk: 4096
     common_password: PASSWORD
     dea_server_ram: 1500
 
-  domain: 216.174.75.136.xip.io
-  system_domain: 216.174.75.136.xip.io.com
+  domain: apps.216.174.75.136.xip.io
+  system_domain: apps.216.174.75.136.xip.io
   system_domain_organization: system_domain
   app_domains:
-    - 216.174.75.136.xip.io
+    - apps.216.174.75.136.xip.io
 
   networks:
     apps: default
     management: default
 
@@ -139,15 +178,19 @@
     port: 8081
     status:
       port: 8080
       user: gorouter
       password: PASSWORD
+    servers:
+      z1:
+        - 0.api.default.production.microbosh
+      z2: []
 
   dea: &dea
     memory_mb: 1500
     disk_mb: 10240
-    directory_server_protocol: http
+    directory_server_protocol: https
 
   dea_next: *dea
 
   nfs_server:
     address: 0.data.default.production.microbosh
@@ -159,10 +202,73 @@
 
   syslog_aggregator:
     address: 0.syslog-aggregator.default.production.microbosh
     port: 54321
 
+  loggregator:
+    shared_secret: some-shared-secret
+    servers:
+      z1:
+      - 0.loggregator.default.production.microbosh
+    trafficcontroller: 0.trafficcontroller.default.production.microbosh
+    z1:
+      trafficcontroller: 0.trafficcontroller.default.production.microbosh
+
+  ssl:
+    skip_cert_verify: true
+
+  ha_proxy:
+    ssl_pem: |
+      -----BEGIN CERTIFICATE-----
+      MIIDCTCCAfGgAwIBAgIJAPI9actz7QN1MA0GCSqGSIb3DQEBBQUAMBsxDTALBgNV
+      BAoMBEJvc2gxCjAIBgNVBAMMASowHhcNMTMxMTMwMTgxMjA0WhcNMTkwNTIzMTgx
+      MjA0WjAbMQ0wCwYDVQQKDARCb3NoMQowCAYDVQQDDAEqMIIBIjANBgkqhkiG9w0B
+      AQEFAAOCAQ8AMIIBCgKCAQEAoZjBT6itvVK459k0Xd+YBt7AbgMPu7/348GUWKau
+      +XV8KO2uqmdr4n8DkaOxEjEZrHr6A76o31HU/ma79LuVv8scy4Q4GM/U/sYGnxhV
+      e9lU65FpzYObKdJrwEToIPsMUEwbQXBasVDLPNOpwjjFBdNPz9/ombKubdLfmZBH
+      8kB1nQezBq6+Pe8EmncXiQtljMXkfK8+L5KTmO7DGj8ResluN5J9v61+ULLR12Um
+      HyFOd9iYlNT4ZjrB118BRSWtzxybua0mKGb5gn2CUiegW4fq3PEkkF1mDhJeYUS1
+      3n7dBdzoQO0oQ8b70mK8f38OWRb4xRRRuC60DlB0C+lKMwIDAQABo1AwTjAdBgNV
+      HQ4EFgQUECMUbfPNSpwyUP+vDfCZoZ5Z2+0wHwYDVR0jBBgwFoAUECMUbfPNSpwy
+      UP+vDfCZoZ5Z2+0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAk3Ku
+      Oowg0Pu8V1x7LCi+BOcsLzDK1iEPmWqJE1fv1R3tYpLzz2zQqrEnerITRReMOlQP
+      JfdowYe+bokmh8gClgItGIsZRZXijMsQVkWwEaKZXLI6a4FgmASHxksQYiZOfOP4
+      IuxEl76wSPHFuSYOIY2CMMnW+FvSPOkpDrTbHeGdMYyMf1qYHrIPbstsOPMA5zwh
+      5nd3WhOERRLpC4B1I9LK+WODgzMg3OkzsWfKaC1eBPbLgoD0rWIlEHB/aQhftlGk
+      +TlL+a9H8J5zh/d3Ra69aspK5lrTEY8oNo5NQ/JyUhOhz9rAzaY6xU+jeBZCIGOJ
+      RHO+HY0gvYQIHE/SYg==
+      -----END CERTIFICATE-----
+      -----BEGIN PRIVATE KEY-----
+      MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQChmMFPqK29Urjn
+      2TRd35gG3sBuAw+7v/fjwZRYpq75dXwo7a6qZ2vifwORo7ESMRmsevoDvqjfUdT+
+      Zrv0u5W/yxzLhDgYz9T+xgafGFV72VTrkWnNg5sp0mvAROgg+wxQTBtBcFqxUMs8
+      06nCOMUF00/P3+iZsq5t0t+ZkEfyQHWdB7MGrr497wSadxeJC2WMxeR8rz4vkpOY
+      7sMaPxF6yW43kn2/rX5QstHXZSYfIU532JiU1PhmOsHXXwFFJa3PHJu5rSYoZvmC
+      fYJSJ6Bbh+rc8SSQXWYOEl5hRLXeft0F3OhA7ShDxvvSYrx/fw5ZFvjFFFG4LrQO
+      UHQL6UozAgMBAAECggEAZyWB/r7EZ1wt+o+CBYl7GKeGXLJHkKfwKsidUBjVBxYe
+      smFEZDCvhFteg8/gbqQ4pwe4HjvMvv8U3W3l+0jhRRL4xk8XH39JjXYJM/PsXKlU
+      syiWSEABAqj1bjyNjr+wFHD/1L1KpnPTxne0m+xwlk9TWnSpm7GZ9S/s2bBmvBG1
+      WF9sZes2Au54AmFVRhRrC52OFa8MnvCQr3vt1Asz8ihfrD6LOhD89NWjDMVAR9xh
+      1gm5lP8mG3omZMNrL9hpcl+4LqBazuJizl2WL5HjwMVmvJQQv5037ezOJwyT548D
+      bJUiQdLRjFkkrZZGKo+ybkKK0DMTbZvf0gYLBoksgQKBgQDMqAjLgB3MfDdJ1so0
+      f2ApmpgUQyK57g3FwzfBBUwyWRd+FXroGHnOmahWnvLKvFoMJlLhA6ixVBGCC5Pq
+      Yzz/L+/oK6+AvSONy4uC4c+0Fa2S7Pno0a97TzwMjynQujq4CYWd4MKYVeitQbOz
+      Lpev+fRdehopAErca3iDHFB02wKBgQDKIztJ/vSlsBDEAx3JGADOLrxqtzEluxkZ
+      bN49Xqw5xL8xwdolVyFVTasDsy6RjQAWrqrHx6iP8/PfstzcgT6Ly7gRg8Fe05wG
+      H2swdoL8RAjOslwaSMCrqy0YwulU75HfAMrvkMAO+sbZkF82Wh70Pmamu3IuZKqH
+      TzAVSJOTiQKBgDRX/ffeisCUPKfcEdefhH7flWoJScZ4RnmAVrA9pKFz+/g5kjfu
+      mqjm0BFnkf2ccwOMgcIfZ3QDZn72axyVyTITlq6xDbBFr+RCXSpaiv8qVDyx87FC
+      gDlvqJIlw7IpD3+mn9AjfmHsBxjZJxb7IbzWl1OZOTunYX5C1o3iHgnlAoGBAKQS
+      Is62BkfyeDlRujx+ojC5GLCaD2drzTyo9F7l2G9vdi1iBromVeUSjMwNBbCYvUir
+      7+0G75gg0INzf/fvZCA+dCKrSiq5IjyKBgwpNbqjUm7LsRyYjuMIpyshEhmh90oG
+      L7JyUKIYBY2UtOO+FL/1YobVQSHNDemUahfsd/TZAoGAV2UwSwApDV4FAixsSsEh
+      Eb5wzbm6G+80BfSFev+HJ5plp7x1EKttb4Q5iaBQdAHRJ7Gbc+hPCqKihZsLkxvo
+      c68xopMK+hZLHRw/rJB/RVCT1EUmYOiqSCck3nk+8f9W/waSrf+EmnIS8KzDJT4n
+      v+9Sh5BF88K0nY5tWckHGgk=
+      -----END PRIVATE KEY-----
+
+
   databases: &databases
     db_scheme: postgres
     address: 0.data.default.production.microbosh
     port: 5524
     roles:
@@ -211,11 +317,11 @@
   cc_api_version: v2
 
   cc: &cc
     logging_level: debug
     external_host: api
-    srv_api_uri: http://api.216.174.75.136.xip.io
+    srv_api_uri: https://api.apps.216.174.75.136.xip.io
     cc_partition: default
     db_encryption_key: PASSWORD
     bootstrap_admin_email: admin@216.174.75.136.xip.io
     bulk_api_password: PASSWORD
     uaa_resource_id: cloud_controller
@@ -236,13 +342,13 @@
 
   login:
     enabled: false
 
   uaa:
-    url: http://uaa.216.174.75.136.xip.io
+    url: https://uaa.apps.216.174.75.136.xip.io
     spring_profiles: postgresql
-    no_ssl: true
+    no_ssl: false
     catalina_opts: -Xmx768m -XX:MaxPermSize=256m
     resource_id: account_manager
     jwt:
       signing_key: |
         -----BEGIN RSA PRIVATE KEY-----