From e835302a05c621df3ca68580e99f544aa9644700 Mon Sep 17 00:00:00 2001 From: Thomas Mitchell Date: Mon, 12 Feb 2018 13:23:39 -0500 Subject: [PATCH] Update properties to 270ish --- base/0-deployment-order.yml | 2 +- base/access.yml | 7 ++++- base/bbs.yml | 4 ++- base/cell.yml | 8 +++++- base/cloud_controller.yml | 16 ++++++++++- base/consul_etcd.yml | 8 ++++-- base/diego.yml | 35 ++++++----------------- base/loggregator.yml | 9 ++++-- base/nats.yml | 39 ++++++++++++++------------ base/router.yml | 4 ++- base/uaa.yml | 4 ++- subkits/blobstore-webdav/blobstore.yml | 4 ++- subkits/db-internal-postgres/db.yml | 7 ++++- subkits/haproxy-notls/haproxy.yml | 4 ++- subkits/haproxy-tls/haproxy.yml | 4 ++- 15 files changed, 95 insertions(+), 60 deletions(-) diff --git a/base/0-deployment-order.yml b/base/0-deployment-order.yml index 6af1fd02..85b50b08 100644 --- a/base/0-deployment-order.yml +++ b/base/0-deployment-order.yml @@ -106,7 +106,7 @@ instance_groups: migrated_from: - name: diego-api -- name: diego # consul, metron, auctioneer, stager, nsync, tps, cc_uploader, route_emitter +- name: diego # consul, metron, auctioneer, tps, cc_uploader, route_emitter instances: (( grab params.diego_instances )) vm_type: (( grab params.diego_vm_type )) azs: (( grab params.availability_zones )) diff --git a/base/access.yml b/base/access.yml index bbb0f29f..7cf8c474 100644 --- a/base/access.yml +++ b/base/access.yml @@ -2,7 +2,12 @@ instance_groups: - name: access jobs: - - { name: consul_agent, release: consul, consumes: { consul: { from: consul_server }}} + - name: consul_agent + release: consul + consumes: + consul_common: {from: consul_common_link} + consul_server: nil + consul_client: {from: consul_client_link} - name: ssh_proxy release: diego properties: diff --git a/base/bbs.yml b/base/bbs.yml index 7d240070..8c0e46ad 100644 --- a/base/bbs.yml +++ b/base/bbs.yml @@ -5,7 +5,9 @@ instance_groups: - name: consul_agent release: consul consumes: - consul: { from: consul_server } + consul_common: {from: consul_common_link} + consul_server: nil + consul_client: {from: consul_client_link} - name: bbs release: diego diff --git a/base/cell.yml b/base/cell.yml index 4be136b8..a64cd40a 100644 --- a/base/cell.yml +++ b/base/cell.yml @@ -2,7 +2,13 @@ instance_groups: - name: cell jobs: - - { name: consul_agent, release: consul, consumes: { consul: { from: consul_server }}} + - name: consul_agent + release: consul + consumes: + consul_common: {from: consul_common_link} + consul_server: nil + consul_client: {from: consul_client_link} + - { name: cflinuxfs2-rootfs-setup, release: cflinuxfs2-rootfs } - name: garden diff --git a/base/cloud_controller.yml b/base/cloud_controller.yml index 867ee35f..5d202a58 100644 --- a/base/cloud_controller.yml +++ b/base/cloud_controller.yml @@ -4,7 +4,10 @@ instance_groups: jobs: - name: consul_agent release: consul - consumes: { consul: { from: consul_server }} + consumes: + consul_common: {from: consul_common_link} + consul_server: nil + consul_client: {from: consul_client_link} properties: consul: agent: @@ -115,6 +118,7 @@ meta: tag: admin cc: + tls_port: 9023 directory_key: (( vault meta.vault "/cc:directory_key" )) bulk_api_user: bulk_api_user bulk_api_password: (( vault meta.vault "/cc:bulk_api" )) @@ -144,6 +148,16 @@ meta: - services - load_balancer default_to_diego_backend: true + + # This Diego block should go away in a future upgrade + # when these keys just become the defaults + diego: + temporary_local_staging: true + temporary_local_tasks: true + temporary_local_apps: true + temporary_local_tps: true + temporary_local_sync: true + droplets: .: (( inject meta.blobstore_config )) droplet_directory_key: (( concat params.env "-cc-droplets-" meta.cc.directory_key )) diff --git a/base/consul_etcd.yml b/base/consul_etcd.yml index 0df75939..63a00bcf 100644 --- a/base/consul_etcd.yml +++ b/base/consul_etcd.yml @@ -5,9 +5,13 @@ instance_groups: - name: consul_agent release: consul consumes: - consul: {from: consul_server} + consul_common: {from: consul_common_link} + consul_server: {from: consul_server_link} + consul_client: {from: consul_client_link} provides: - consul: {as: consul_server} + consul_common: {as: consul_common_link, shared: true} + consul_server: {as: consul_server_link, shared: true} + consul_client: {as: consul_client_link, shared: true} properties: consul: agent: diff --git a/base/diego.yml b/base/diego.yml index 4f3d39aa..a56016a0 100644 --- a/base/diego.yml +++ b/base/diego.yml @@ -2,7 +2,13 @@ instance_groups: - name: diego jobs: - - { name: consul_agent, release: consul, consumes: { consul: { from: consul_server }}} + - name: consul_agent + release: consul + consumes: + consul_common: {from: consul_common_link} + consul_server: nil + consul_client: {from: consul_client_link} + - name: auctioneer release: diego properties: @@ -18,37 +24,12 @@ instance_groups: ca_cert: (( grab meta.certs.diego.ca )) .: (( inject meta.certs.diego.auctioneer.server )) - - name: stager - release: capi - properties: - capi: - stager: - bbs: - ca_cert: (( grab meta.certs.diego.ca )) - .: (( inject meta.certs.diego.bbs.client )) - cc: - basic_auth_password: (( grab meta.cc.internal_api_password )) - basic_auth_username: (( grab meta.cc.internal_api_user )) - - - name: nsync - release: capi - properties: - capi: - nsync: - bbs: - ca_cert: (( grab meta.certs.diego.ca )) - .: (( inject meta.certs.diego.bbs.client )) - cc: - base_url: (( concat "https://api." params.system_domain )) - basic_auth_password: (( grab meta.cc.internal_api_password )) - basic_auth_username: (( grab meta.cc.internal_api_user )) - diego_privileged_containers: true - - name: tps release: capi properties: capi: tps: + listener_enabled: false bbs: ca_cert: (( grab meta.certs.diego.ca )) .: (( inject meta.certs.diego.bbs.client )) diff --git a/base/loggregator.yml b/base/loggregator.yml index 5b091441..fcc6111a 100644 --- a/base/loggregator.yml +++ b/base/loggregator.yml @@ -5,7 +5,9 @@ instance_groups: - name: consul_agent release: consul consumes: - consul: { from: consul_server } + consul_common: {from: consul_common_link} + consul_server: nil + consul_client: {from: consul_client_link} properties: consul: agent: @@ -55,7 +57,9 @@ instance_groups: - name: consul_agent release: consul consumes: - consul: { from: consul_server } + consul_common: {from: consul_common_link} + consul_server: nil + consul_client: {from: consul_client_link} properties: consul: agent: @@ -68,6 +72,7 @@ instance_groups: system_domain: (( grab params.system_domain )) cc: srv_api_uri: (( grab meta.cc.srv_api_uri )) + tls_port: (( grab meta.cc.tls_port )) ssl: skip_cert_verify: (( grab params.skip_ssl_validation )) loggregator: diff --git a/base/nats.yml b/base/nats.yml index 23192ebc..7f7e0cf3 100644 --- a/base/nats.yml +++ b/base/nats.yml @@ -2,22 +2,25 @@ instance_groups: - name: nats jobs: - - name: consul_agent - release: consul - consumes: - consul: {from: consul_server} - - name: nats - release: nats - provides: - nats: {as: nats, shared: true} - properties: - nats: - debug: false - trace: false - monitor_port: 9222 - prof_port: 0 - port: 4222 + - name: consul_agent + release: consul + consumes: + consul_common: {from: consul_common_link} + consul_server: nil + consul_client: {from: consul_client_link} - machines: (( grab instance_groups.nats.networks[0].static_ips )) - user: nats_user - password: (( vault meta.vault "/nats:password" )) \ No newline at end of file + - name: nats + release: nats + provides: + nats: {as: nats, shared: true} + properties: + nats: + debug: false + trace: false + monitor_port: 9222 + prof_port: 0 + port: 4222 + + machines: (( grab instance_groups.nats.networks[0].static_ips )) + user: nats_user + password: (( vault meta.vault "/nats:password" )) \ No newline at end of file diff --git a/base/router.yml b/base/router.yml index 887a61c4..7684119d 100644 --- a/base/router.yml +++ b/base/router.yml @@ -5,7 +5,9 @@ instance_groups: - name: consul_agent release: consul consumes: - consul: { from: consul_server } + consul_common: {from: consul_common_link} + consul_server: nil + consul_client: {from: consul_client_link} properties: consul: agent: diff --git a/base/uaa.yml b/base/uaa.yml index 34c188d0..4ae7f5a5 100644 --- a/base/uaa.yml +++ b/base/uaa.yml @@ -5,7 +5,9 @@ instance_groups: - name: consul_agent release: consul consumes: - consul: { from: consul_server } + consul_common: {from: consul_common_link} + consul_server: nil + consul_client: {from: consul_client_link} properties: consul: agent: diff --git a/subkits/blobstore-webdav/blobstore.yml b/subkits/blobstore-webdav/blobstore.yml index 9b85ea68..9e475fc0 100644 --- a/subkits/blobstore-webdav/blobstore.yml +++ b/subkits/blobstore-webdav/blobstore.yml @@ -6,7 +6,9 @@ instance_groups: - name: consul_agent release: consul consumes: - consul: { from: consul_server } + consul_common: {from: consul_common_link} + consul_server: nil + consul_client: {from: consul_client_link} properties: consul: agent: diff --git a/subkits/db-internal-postgres/db.yml b/subkits/db-internal-postgres/db.yml index 97c58da2..2320638b 100644 --- a/subkits/db-internal-postgres/db.yml +++ b/subkits/db-internal-postgres/db.yml @@ -2,7 +2,12 @@ instance_groups: - name: postgres jobs: - - { name: consul_agent, release: consul, consumes: { consul: { from: consul_server } } } + - name: consul_agent + release: consul + consumes: + consul_common: {from: consul_common_link} + consul_server: nil + consul_client: {from: consul_client_link} - name: postgres release: postgres properties: diff --git a/subkits/haproxy-notls/haproxy.yml b/subkits/haproxy-notls/haproxy.yml index 1acbc2c1..0836387f 100644 --- a/subkits/haproxy-notls/haproxy.yml +++ b/subkits/haproxy-notls/haproxy.yml @@ -9,7 +9,9 @@ instance_groups: - name: consul_agent release: consul consumes: - consul: { from: consul_server } + consul_common: {from: consul_common_link} + consul_server: nil + consul_client: {from: consul_client_link} - name: haproxy release: haproxy diff --git a/subkits/haproxy-tls/haproxy.yml b/subkits/haproxy-tls/haproxy.yml index ff33013f..440aa0fa 100644 --- a/subkits/haproxy-tls/haproxy.yml +++ b/subkits/haproxy-tls/haproxy.yml @@ -9,7 +9,9 @@ instance_groups: - name: consul_agent release: consul consumes: - consul: { from: consul_server } + consul_common: {from: consul_common_link} + consul_server: nil + consul_client: {from: consul_client_link} - name: haproxy release: haproxy