Revert "Revert "Revert "Merge remote-tracking branch 'remotes/origin/…

…cf-syslog-drain-release' into develop"""

This reverts commit 755b745.

Signed-off-by: Steve Taylor <staylor@pivotal.io>
Signed-off-by: Jesse Alford <jalford@pivotal.io>

.gitmodules

@@ -61,6 +61,3 @@
 [submodule "src/statsd-injector-release"]
 	path = src/statsd-injector-release
 	url = https://github.com/cloudfoundry/statsd-injector-release
-[submodule "src/cf-syslog-drain-release"]
-	path = src/cf-syslog-drain-release
-	url = https://github.com/cloudfoundry/cf-syslog-drain-release

spec/fixtures/aws/cf-manifest.yml

@@ -697,7 +697,7 @@ jobs:
     release: cf
   - name: doppler
     release: cf
-  - name: adapter
+  - name: syslog_drain_binder
     release: cf
   - name: metron_agent
     release: cf
@@ -723,7 +723,7 @@ jobs:
     release: cf
   - name: doppler
     release: cf
-  - name: adapter
+  - name: syslog_drain_binder
     release: cf
   - name: metron_agent
     release: cf
@@ -734,8 +734,6 @@ jobs:
   name: doppler_z1
   networks:
   - name: cf1
-    static_ips: 
-    - 10.0.31.210
   properties:
     consul:
       agent:
@@ -756,7 +754,7 @@ jobs:
     release: cf
   - name: doppler
     release: cf
-  - name: adapter
+  - name: syslog_drain_binder
     release: cf
   - name: metron_agent
     release: cf
@@ -767,8 +765,6 @@ jobs:
   name: doppler_z2
   networks:
   - name: cf2
-    static_ips: 
-    - 10.0.47.211
   properties:
     consul:
       agent:
@@ -789,7 +785,7 @@ jobs:
     release: cf
   - name: doppler
     release: cf
-  - name: adapter
+  - name: syslog_drain_binder
     release: cf
   - name: metron_agent
     release: cf
@@ -833,10 +829,6 @@ jobs:
     release: cf
   - name: metron_agent
     release: cf
-  - consumes:
-      doppler: nil
-    name: reverse_log_proxy
-    release: cf 
   - consumes:
       nats: nil
     name: route_registrar
@@ -883,43 +875,13 @@ jobs:
     release: cf
   - name: metron_agent
     release: cf
-  - consumes:
-      doppler: nil
-    name: reverse_log_proxy
-    release: cf
   - consumes:
       nats: nil
     name: route_registrar
     release: cf
   update:
     max_in_flight: 1
     serial: true
-- default_networks:
-  - name: cf1
-  instances: 1
-  name: loggregator_scheduler_z1
-  networks:
-  - name: cf1
-  properties:
-    metron_agent:
-      zone: z1
-  resource_pool: small_z1
-  templates:
-  - consumes:
-      consul_client: nil
-      consul_common: nil
-      consul_server: nil
-    name: consul_agent
-    release: cf
-  - name: metron_agent
-    release: cf
-  - consumes:
-      adapter_addrs: nil
-    name: scheduler
-    release: cf
-  update:
-    max_in_flight: 1
-    serial: true
 - default_networks:
   - name: cf1
   instances: 1
@@ -1396,11 +1358,9 @@ properties:
   doppler:
     blacklisted_syslog_ranges: null
     debug: false
-    disable_announce: true
     etcd:
       client_cert: ETCD_CLIENT_CERT
       client_key: ETCD_CLIENT_KEY
-    grpc_port: 8082
     maxRetainedLogMessages: 100
     message_drain_buffer_size: null
     outgoing_port: 8081
@@ -1452,10 +1412,6 @@ properties:
     - end: 10.0.255.255
       start: 10.0.0.0
     debug: false
-    doppler:
-      addrs:
-      - 10.0.31.210
-      - 10.0.47.211
     etcd:
       ca_cert: ETCD_CA_CERT
       machines:
@@ -1477,9 +1433,6 @@ properties:
       statsd_injector:
         cert: LOGGREGATOR_STATSDINJECTOR_CERT
         key: LOGGREGATOR_STATSDINJECTOR_KEY
-      reverse_log_proxy:
-        cert: LOGGREGATOR_REVERSELOGPROXY_CERT
-        key: LOGGREGATOR_REVERSELOGPROXY_KEY
       syslogdrainbinder:
         cert: LOGGREGATOR_SYSLOGDRAINBINDER_CERT
         key: LOGGREGATOR_SYSLOGDRAINBINDER_KEY
@@ -1579,47 +1532,17 @@ properties:
     enabled: null
     port: null
     uri: null
-  scalablesyslog:
-    adapter:
-      addrs:
-      - 10.0.31.210
-      - 10.0.47.211
-      logs:
-        addr: reverse-log-proxy.service.cf.internal:8082
-      port: 4443
-      tls:
-        ca: SCALABLESYSLOG_CA
-        cert: SCALABLESYSLOG_ADAPTER_CERT
-        cn: ss-adapter
-        key: SCALABLESYSLOG_ADAPTER_KEY
-    adapter_rlp:
-      tls:
-        ca: SCALABLESYSLOG_CA
-        cert: SCALABLESYSLOG_ADAPTER_RLP_CERT
-        cn: reverselogproxy
-        key: SCALABLESYSLOG_ADAPTER_RLP_KEY
-    scheduler:
-      api:
-        url: https://cloud-controller-ng.service.cf.internal:9023
-      require_opt_in: false
-      tls:
-        api:
-          ca: DIEGO_CA
-          cert: CLOUD_CONTROLLER_CERT
-          cn: cloud-controller-ng.service.cf.internal
-          key: CLOUD_CONTROLLER_KEY
-        client:
-          adapter_cn: ss-scheduler
-          ca: SCALABLESYSLOG_CA
-          cert: SCALABLESYSLOG_SCHEDULER_CLIENT_CERT
-          key: SCALABLESYSLOG_SCHEDULER_CLIENT_KEY
   smoke_tests: null
   ssl:
     skip_cert_verify: true
   statsd_injector:
     deployment: ENVIRONMENT
   support_address: http://support.cloudfoundry.com
   syslog_daemon_config: null
+  syslog_drain_binder:
+    etcd:
+      client_cert: ETCD_CLIENT_CERT
+      client_key: ETCD_CLIENT_KEY
   system_domain: SYSTEM_DOMAIN
   system_domain_organization: SYSTEM_DOMAIN_ORGANIZATION
   template_only:

spec/fixtures/aws/cf-stub.yml

@@ -117,9 +117,6 @@ properties:
       metron:
         cert: LOGGREGATOR_METRON_CERT
         key: LOGGREGATOR_METRON_KEY
-      reverse_log_proxy:
-        cert: LOGGREGATOR_REVERSELOGPROXY_CERT
-        key: LOGGREGATOR_REVERSELOGPROXY_KEY
       syslogdrainbinder:
         cert: LOGGREGATOR_SYSLOGDRAINBINDER_CERT
         key: LOGGREGATOR_SYSLOGDRAINBINDER_KEY
@@ -135,29 +132,6 @@ properties:
     status:
       user: ROUTER_USER
       password: ROUTER_PASSWORD
-  scalablesyslog:
-    adapter:
-      logs:
-        addr: reverse-log-proxy.service.cf.internal:8082
-      tls:
-        ca: SCALABLESYSLOG_CA
-        cert: SCALABLESYSLOG_ADAPTER_CERT
-        key: SCALABLESYSLOG_ADAPTER_KEY
-    adapter_rlp:
-      tls:
-        ca: SCALABLESYSLOG_CA
-        cert: SCALABLESYSLOG_ADAPTER_RLP_CERT
-        key: SCALABLESYSLOG_ADAPTER_RLP_KEY
-    scheduler:
-      tls:
-        api:
-          ca: DIEGO_CA
-          cert: CLOUD_CONTROLLER_CERT
-          key: CLOUD_CONTROLLER_KEY
-        client:
-          ca: SCALABLESYSLOG_CA
-          cert: SCALABLESYSLOG_SCHEDULER_CLIENT_CERT
-          key: SCALABLESYSLOG_SCHEDULER_CLIENT_KEY
   uaa:
     admin:
       client_secret: ADMIN_SECRET