Remove more obsolete Diego properties

- Remove Locket API location value that matches default in v2.1.0+ - Remove configuration to opt cell rep into TLS API listeners [#155485284]
schmidtsv · Mar 15, 2018 · 58ad69c · 58ad69c
1 parent cf6653e
commit 58ad69c
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 13 deletions.
diff --git a/cf-deployment.yml b/cf-deployment.yml
@@ -271,8 +271,6 @@ instance_groups:
             ca_cert: "((service_cf_internal_ca.certificate))"
             client_cert: "((diego_rep_client.certificate))"
             client_key: "((diego_rep_client.private_key))"
-          locket:
-            api_location: "locket.service.cf.internal:8891"
       loggregator: &diego_loggregator_client_properties
         use_v2_api: true
         ca_cert: "((loggregator_ca.certificate))"
@@ -937,8 +935,6 @@ instance_groups:
             ca_cert: "((service_cf_internal_ca.certificate))"
             client_cert: "((diego_rep_client.certificate))"
             client_key: "((diego_rep_client.private_key))"
-          locket:
-            api_location: "locket.service.cf.internal:8891"
       loggregator: *diego_loggregator_client_properties
   - name: cloud_controller_clock
     release: capi
@@ -1102,9 +1098,6 @@ instance_groups:
         rep:
           preloaded_rootfses:
           - cflinuxfs2:/var/vcap/packages/cflinuxfs2/rootfs.tar
-          require_tls: true
-          locket:
-            api_location: "locket.service.cf.internal:8891"
       containers:
         trusted_ca_certificates:
           - ((application_ca.certificate))

diff --git a/operations/experimental/windows2016-cell.yml b/operations/experimental/windows2016-cell.yml
@@ -50,12 +50,9 @@
       properties:
         diego:
           rep:
-            locket:
-              api_location: locket.service.cf.internal:8891
             open_bindmounts_acl: true
             preloaded_rootfses:
             - windows2016:oci:///C:/var/vcap/packages/windows2016fs
-            require_tls: true
         loggregator:
           ca_cert: ((loggregator_ca.certificate))
           cert: ((loggregator_tls_metron.certificate))

diff --git a/operations/windows-cell.yml b/operations/windows-cell.yml
@@ -37,11 +37,8 @@
             instance_identity_ca_cert: ((diego_instance_identity_ca.certificate))
             instance_identity_key: ((diego_instance_identity_ca.private_key))
           rep:
-            locket:
-              api_location: locket.service.cf.internal:8891
             preloaded_rootfses:
             - windows2012R2:/tmp/windows2012R2
-            require_tls: true
         loggregator:
           ca_cert: ((loggregator_ca.certificate))
           cert: ((loggregator_tls_metron.certificate))