Merge branch 'diego-1496675408-local-tcp-emitter' into develop

cloudfoundry · Jun 5, 2017 · 20cccb8 · 20cccb8
2 parents 82a1f7b + 4bbde91
commit 20cccb8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 47 deletions.
diff --git a/operations/experimental/enable-local-route-emitter-tcp.yml b/operations/experimental/enable-local-route-emitter-tcp.yml
@@ -1,13 +1 @@
----
-- type: replace
-  path: /instance_groups/name=diego-cell/jobs/name=route_emitter/properties/tcp?/enabled?
-  value: true
-
-- type: replace
-  path: /instance_groups/name=diego-cell/jobs/name=route_emitter/properties/uaa?
-  value:
-    client_secret: "((uaa_clients_tcp_emitter_secret))"
-    ca_cert: "((uaa_ca.certificate))"
-
-- type: remove
-  path: /instance_groups/name=tcp-emitter
+# This file intentionally left blank
diff --git a/operations/tcp-routing-gcp.yml b/operations/tcp-routing-gcp.yml
@@ -54,38 +54,11 @@
             - cf-etcd.service.cf.internal
 
 - type: replace
-  path: /instance_groups/-
+  path: /instance_groups/name=diego-cell/jobs/name=route_emitter/properties/tcp?/enabled?
+  value: true
+
+- type: replace
+  path: /instance_groups/name=diego-cell/jobs/name=route_emitter/properties/uaa?
   value:
-    name: tcp-emitter
-    azs:
-    - z1
-    - z2
-    instances: 2
-    vm_type: m3.medium
-    stemcell: default
-    networks:
-    - name: default
-    jobs:
-    - name: consul_agent
-      release: consul
-      consumes:
-        consul_common: {from: consul_common_link}
-        consul_server: nil
-        consul_client: {from: consul_client_link}
-    - name: tcp_emitter
-      release: routing
-      properties:
-        tcp_emitter:
-          oauth_secret: "((uaa_clients_tcp_emitter_secret))"
-          bbs:
-            client_cert: "((diego_bbs_client.certificate))"
-            client_key: "((diego_bbs_client.private_key))"
-        bbs:
-          api_location: bbs.service.cf.internal:8889
-          ca_cert: "((diego_bbs_client.ca))"
-        uaa:
-          ca_cert: "((uaa_ca.certificate))"
-          tls_port: 8443
-    - name: metron_agent
-      release: loggregator
-      properties: *metron_agent_properties
+    client_secret: "((uaa_clients_tcp_emitter_secret))"
+    ca_cert: "((uaa_ca.certificate))"