Revert "Add ca_truster job to trust CA certs configured by manifest"

This reverts commit 064fcac.
cloudfoundry-attic · Mar 24, 2015 · c999fed · c999fed
1 parent d3ba3d8
commit c999fed
Show file tree

Hide file tree

Showing 13 changed files with 6 additions and 370 deletions.
diff --git a/bosh-lite/cf-stub-spiff.yml b/bosh-lite/cf-stub-spiff.yml
@@ -8,29 +8,6 @@ properties:
   loggregator_endpoint:
     shared_secret: PLACEHOLDER-LOGGREGATOR-SECRET
 
-  ca_truster:
-    certificates:
-      - |
-          -----BEGIN CERTIFICATE-----
-          MIIDETCCAfmgAwIBAgIJANZuykf1uh3LMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-          BAMMFCouMTAuMjQ0LjAuMzQueGlwLmlvMB4XDTE0MTIyNDIzMTkxM1oXDTI0MTIy
-          MTIzMTkxM1owHzEdMBsGA1UEAwwUKi4xMC4yNDQuMC4zNC54aXAuaW8wggEiMA0G
-          CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCjq73Fgwfj2UT0/+wR9kVVsGAguMj
-          poA0opLCgE0yHStAhSvqq7YpO39dH3vBMWXyr2xIfDyaeZyhV86jWu/ZKswGjNGI
-          ZKv/yUINe1bqukOBqd+SHVvkVhxSLJuD1MR83JQMONRjOPJp661/ABpVhnrNfBiA
-          AA6aaFv4/KbyGY/E1FHoUXqEdh4WxaJdfX6SbgG05ArWxhSD7PNj4CYvJWGCdvqP
-          KBsvWFDrkxBHn5h1JIDfZJB8FKP6vaHBr7MU4pIHM+qaZ1Y+8ja0wcgkHn4YHcp6
-          IOhqpck7LaH5Qq2ydYFNTcG4fTbG0jXqcit2WSUxRkXzWnrgo2E0SiHBAgMBAAGj
-          UDBOMB0GA1UdDgQWBBSpCtEDtEvMwaZzXN6Lvk5U7Eyn2zAfBgNVHSMEGDAWgBSp
-          CtEDtEvMwaZzXN6Lvk5U7Eyn2zAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
-          A4IBAQB1YIHmw3gPiMn8WDR4yVxDvSVgFHY6ZE1iZb17vVs4N2/mhQZXWJ2nZV02
-          goAivtgxHOj39sK5OBWsGvrQo5H8dt1t4XmbwB1C6xRerGc25dhDRq42RqhCN0RJ
-          zzjd9b8YSiwtAaZlW36l2jVDLfRapb00tWToF9qYrDrmKy2sekS7g2hbiRStcue/
-          bpT4X/CHxb/lUbpL4m8BpDbkGiOJgl+SEHRx5tZ0Kob/RDQRCcN3p+71FRbDIEBj
-          +8sJl/yUUUPwQ6PNYx6cjtlICWJ1G0l0hRa141VXPqSNCmxYS4dp/8ifPCSoLc+k
-          9TXFkuGl+86CPTyyMJxyMhEcAGZT
-          -----END CERTIFICATE-----
-
   cc:
     min_cli_version: "6.0.0"
     min_recommended_cli_version: "6.10.0"

diff --git a/jobs/ca_truster/monit b/jobs/ca_truster/monit
diff --git a/jobs/ca_truster/spec b/jobs/ca_truster/spec
diff --git a/jobs/ca_truster/templates/ca_truster.sh.erb b/jobs/ca_truster/templates/ca_truster.sh.erb
diff --git a/jobs/ca_truster/templates/ca_truster_ctl.erb b/jobs/ca_truster/templates/ca_truster_ctl.erb
diff --git a/spec/fixtures/aws/cf-manifest.yml.erb b/spec/fixtures/aws/cf-manifest.yml.erb
@@ -36,8 +36,6 @@ jobs:
     release: cf
   - name: metron_agent
     release: cf
-  - name: ca_truster
-    release: cf
   update: {}
 - instances: 1
   name: nats_z1
@@ -58,8 +56,6 @@ jobs:
     release: cf
   - name: metron_agent
     release: cf
-  - name: ca_truster
-    release: cf
   update: {}
 - instances: 1
   name: nats_z2
@@ -80,8 +76,6 @@ jobs:
     release: cf
   - name: metron_agent
     release: cf
-  - name: ca_truster
-    release: cf
   update: {}
 - instances: 1
   name: consul_z1
@@ -107,8 +101,6 @@ jobs:
     release: cf
   - name: metron_agent
     release: cf
-  - name: ca_truster
-    release: cf
   update:
     max_in_flight: 1
     serial: true
@@ -137,8 +129,6 @@ jobs:
     release: cf
   - name: metron_agent
     release: cf
-  - name: ca_truster
-    release: cf
   update:
     max_in_flight: 1
     serial: true
@@ -163,8 +153,6 @@ jobs:
     release: cf
   - name: metron_agent
     release: cf
-  - name: ca_truster
-    release: cf
   update: {}
 - instances: 1
   name: etcd_z2
@@ -186,8 +174,6 @@ jobs:
     release: cf
   - name: metron_agent
     release: cf
-  - name: ca_truster
-    release: cf
   update: {}
 - instances: 1
   name: stats_z1
@@ -204,8 +190,6 @@ jobs:
     release: cf
   - name: metron_agent
     release: cf
-  - name: ca_truster
-    release: cf
   update: {}
 - instances: 0
   name: nfs_z1
@@ -224,8 +208,6 @@ jobs:
     release: cf
   - name: metron_agent
     release: cf
-  - name: ca_truster
-    release: cf
   update: {}
 - instances: 0
   name: postgres_z1
@@ -244,8 +226,6 @@ jobs:
     release: cf
   - name: metron_agent
     release: cf
-  - name: ca_truster
-    release: cf
   update: {}
 - instances: 1
   name: uaa_z1
@@ -271,8 +251,6 @@ jobs:
     release: cf
   - name: metron_agent
     release: cf
-  - name: ca_truster
-    release: cf
   - name: consul_agent
     release: cf
   update: {}
@@ -300,8 +278,6 @@ jobs:
     release: cf
   - name: metron_agent
     release: cf
-  - name: ca_truster
-    release: cf
   - name: consul_agent
     release: cf
   update: {}
@@ -320,8 +296,6 @@ jobs:
     release: cf
   - name: metron_agent
     release: cf
-  - name: ca_truster
-    release: cf
   update: {}
 - instances: 1
   name: login_z2
@@ -338,8 +312,6 @@ jobs:
     release: cf
   - name: metron_agent
     release: cf
-  - name: ca_truster
-    release: cf
   update: {}
 - instances: 1
   name: api_z1
@@ -374,8 +346,6 @@ jobs:
     release: cf
   - name: nfs_mounter
     release: cf
-  - name: ca_truster
-    release: cf
   - name: consul_agent
     release: cf
   update: {}
@@ -412,8 +382,6 @@ jobs:
     release: cf
   - name: nfs_mounter
     release: cf
-  - name: ca_truster
-    release: cf
   - name: consul_agent
     release: cf
   update: {}
@@ -433,8 +401,6 @@ jobs:
     release: cf
   - name: metron_agent
     release: cf
-  - name: ca_truster
-    release: cf
   update: {}
 - instances: 1
   name: api_worker_z1
@@ -460,8 +426,6 @@ jobs:
     release: cf
   - name: nfs_mounter
     release: cf
-  - name: ca_truster
-    release: cf
   update: {}
 - instances: 1
   name: api_worker_z2
@@ -487,8 +451,6 @@ jobs:
     release: cf
   - name: nfs_mounter
     release: cf
-  - name: ca_truster
-    release: cf
   update: {}
 - instances: 1
   name: hm9000_z1
@@ -505,8 +467,6 @@ jobs:
     release: cf
   - name: metron_agent
     release: cf
-  - name: ca_truster
-    release: cf
   update: {}
 - instances: 1
   name: hm9000_z2
@@ -523,8 +483,6 @@ jobs:
     release: cf
   - name: metron_agent
     release: cf
-  - name: ca_truster
-    release: cf
   update: {}
 - instances: 1
   name: runner_z1
@@ -546,8 +504,6 @@ jobs:
     release: cf
   - name: metron_agent
     release: cf
-  - name: ca_truster
-    release: cf
   update:
     max_in_flight: 1
 - instances: 1
@@ -570,8 +526,6 @@ jobs:
     release: cf
   - name: metron_agent
     release: cf
-  - name: ca_truster
-    release: cf
   update:
     max_in_flight: 1
 - instances: 1
@@ -648,8 +602,6 @@ jobs:
     release: cf
   - name: metron_agent
     release: cf
-  - name: ca_truster
-    release: cf
   - name: consul_agent
     release: cf
   update: {}
@@ -679,8 +631,6 @@ jobs:
     release: cf
   - name: metron_agent
     release: cf
-  - name: ca_truster
-    release: cf
   - name: consul_agent
     release: cf
   update: {}
@@ -709,8 +659,6 @@ jobs:
     release: cf
   - name: metron_agent
     release: cf
-  - name: ca_truster
-    release: cf
   - name: consul_agent
     release: cf
   update: {}
@@ -739,8 +687,6 @@ jobs:
     release: cf
   - name: metron_agent
     release: cf
-  - name: ca_truster
-    release: cf
   - name: consul_agent
     release: cf
   update: {}
@@ -753,8 +699,6 @@ jobs:
   templates:
   - name: acceptance-tests
     release: cf
-  - name: ca_truster
-    release: cf
 - instances: 1
   lifecycle: errand
   name: smoke_tests
@@ -767,8 +711,6 @@ jobs:
   templates:
   - name: smoke-tests
     release: cf
-  - name: ca_truster
-    release: cf
 meta:
   environment: null
   releases:
@@ -796,8 +738,6 @@ properties:
   acceptance_tests: null
   app_domains:
   - example.com
-  ca_truster:
-    certificates: []
   cc:
     allowed_cors_domains: []
     app_events: