adding trusted certs back fixes #118

genesis-community · Mar 22, 2021 · 844dc04 · 844dc04
1 parent 52b0229
commit 844dc04
Show file tree

Hide file tree

Showing 40 changed files with 42 additions and 2 deletions.
diff --git a/hooks/blueprint b/hooks/blueprint
@@ -23,7 +23,8 @@ merge=( bosh-deployment/bosh.yml
         bosh-deployment/credhub.yml
         bosh-deployment/misc/dns.yml
         bosh-deployment/misc/ntp.yml
-        bosh-deployment/misc/proxy.yml )
+        bosh-deployment/misc/proxy.yml
+        bosh-deployment/misc/trusted-certs.yml )
 
 # Check for ops features
 declare -a features
@@ -163,7 +164,7 @@ for want in ${GENESIS_REQUESTED_FEATURES}; do
     # when using warden we want the bosh-lite.yml to be merged
     # this will add and configure the garden deamon
     merge+=( bosh-deployment/bosh-lite.yml
-             "overlay/cpis/${want}.yml" 
+             "overlay/cpis/${want}.yml"
              overlay/no-proto.yml )
     ;;
 

diff --git a/overlay/base.yml b/overlay/base.yml
@@ -47,6 +47,7 @@ bosh-variables:
   http_proxy:  (( grab params.http_proxy  || "" ))
   https_proxy: (( grab params.https_proxy || "" ))
   no_proxy:    (( grab params.no_proxy    || "" ))
+  trusted_ca_cert: (( grab params.trusted_certs || "" ))
 
 params:
   bosh_hostname:  bosh

diff --git a/spec/results/all-addons-source.yml b/spec/results/all-addons-source.yml
@@ -324,6 +324,7 @@ instance_groups:
       ssl:
         cert: <!{meta.vault}/ssl/server:certificate!>
         key: <!{meta.vault}/ssl/server:key!>
+      trusted_certs: ""
       user_management:
         provider: uaa
         uaa:

diff --git a/spec/results/all-addons.yml b/spec/results/all-addons.yml
@@ -332,6 +332,7 @@ instance_groups:
       ssl:
         cert: <!{meta.vault}/ssl/server:certificate!>
         key: <!{meta.vault}/ssl/server:key!>
+      trusted_certs: ""
       user_management:
         provider: uaa
         uaa:

diff --git a/spec/results/all-params.yml b/spec/results/all-params.yml
@@ -334,6 +334,7 @@ instance_groups:
       ssl:
         cert: <!{meta.vault}/ssl/server:certificate!>
         key: <!{meta.vault}/ssl/server:key!>
+      trusted_certs: test-trusted-certs
       user_management:
         provider: uaa
         uaa:

diff --git a/spec/results/aws-iam-profile-s3-blobstore-iam-profile.yml b/spec/results/aws-iam-profile-s3-blobstore-iam-profile.yml
@@ -296,6 +296,7 @@ instance_groups:
       ssl:
         cert: <!{meta.vault}/ssl/server:certificate!>
         key: <!{meta.vault}/ssl/server:key!>
+      trusted_certs: ""
       user_management:
         provider: uaa
         uaa:

diff --git a/spec/results/aws-iam-profile-s3-blobstore.yml b/spec/results/aws-iam-profile-s3-blobstore.yml
@@ -298,6 +298,7 @@ instance_groups:
       ssl:
         cert: <!{meta.vault}/ssl/server:certificate!>
         key: <!{meta.vault}/ssl/server:key!>
+      trusted_certs: ""
       user_management:
         provider: uaa
         uaa:

diff --git a/spec/results/aws-iam-profile.yml b/spec/results/aws-iam-profile.yml
@@ -311,6 +311,7 @@ instance_groups:
       ssl:
         cert: <!{meta.vault}/ssl/server:certificate!>
         key: <!{meta.vault}/ssl/server:key!>
+      trusted_certs: ""
       user_management:
         provider: uaa
         uaa:

diff --git a/spec/results/aws-s3-blobstore-iam-profile.yml b/spec/results/aws-s3-blobstore-iam-profile.yml
@@ -297,6 +297,7 @@ instance_groups:
       ssl:
         cert: <!{meta.vault}/ssl/server:certificate!>
         key: <!{meta.vault}/ssl/server:key!>
+      trusted_certs: ""
       user_management:
         provider: uaa
         uaa:

diff --git a/spec/results/aws-s3-blobstore.yml b/spec/results/aws-s3-blobstore.yml
@@ -299,6 +299,7 @@ instance_groups:
       ssl:
         cert: <!{meta.vault}/ssl/server:certificate!>
         key: <!{meta.vault}/ssl/server:key!>
+      trusted_certs: ""
       user_management:
         provider: uaa
         uaa:

diff --git a/spec/results/aws.yml b/spec/results/aws.yml
@@ -312,6 +312,7 @@ instance_groups:
       ssl:
         cert: <!{meta.vault}/ssl/server:certificate!>
         key: <!{meta.vault}/ssl/server:key!>
+      trusted_certs: ""
       user_management:
         provider: uaa
         uaa:

diff --git a/spec/results/azure.yml b/spec/results/azure.yml
@@ -317,6 +317,7 @@ instance_groups:
       ssl:
         cert: <!{meta.vault}/ssl/server:certificate!>
         key: <!{meta.vault}/ssl/server:key!>
+      trusted_certs: ""
       user_management:
         provider: uaa
         uaa:

diff --git a/spec/results/blacksmith-integration.yml b/spec/results/blacksmith-integration.yml
@@ -318,6 +318,7 @@ instance_groups:
       ssl:
         cert: <!{meta.vault}/ssl/server:certificate!>
         key: <!{meta.vault}/ssl/server:key!>
+      trusted_certs: ""
       user_management:
         provider: uaa
         uaa:

diff --git a/spec/results/external-db-no-tls.yml b/spec/results/external-db-no-tls.yml
@@ -310,6 +310,7 @@ instance_groups:
       ssl:
         cert: <!{meta.vault}/ssl/server:certificate!>
         key: <!{meta.vault}/ssl/server:key!>
+      trusted_certs: ""
       user_management:
         provider: uaa
         uaa:

diff --git a/spec/results/external-db.yml b/spec/results/external-db.yml
@@ -324,6 +324,7 @@ instance_groups:
       ssl:
         cert: <!{meta.vault}/ssl/server:certificate!>
         key: <!{meta.vault}/ssl/server:key!>
+      trusted_certs: ""
       user_management:
         provider: uaa
         uaa:

diff --git a/spec/results/google.yml b/spec/results/google.yml
@@ -306,6 +306,7 @@ instance_groups:
       ssl:
         cert: <!{meta.vault}/ssl/server:certificate!>
         key: <!{meta.vault}/ssl/server:key!>
+      trusted_certs: ""
       user_management:
         provider: uaa
         uaa:

diff --git a/spec/results/node-exporter.yml b/spec/results/node-exporter.yml
@@ -310,6 +310,7 @@ instance_groups:
       ssl:
         cert: <!{meta.vault}/ssl/server:certificate!>
         key: <!{meta.vault}/ssl/server:key!>
+      trusted_certs: ""
       user_management:
         provider: uaa
         uaa:

diff --git a/spec/results/openstack.yml b/spec/results/openstack.yml
@@ -306,6 +306,7 @@ instance_groups:
       ssl:
         cert: <!{meta.vault}/ssl/server:certificate!>
         key: <!{meta.vault}/ssl/server:key!>
+      trusted_certs: ""
       user_management:
         provider: uaa
         uaa:

diff --git a/spec/results/ops-override.yml b/spec/results/ops-override.yml
@@ -304,6 +304,7 @@ instance_groups:
       ssl:
         cert: <!{meta.vault}/ssl/server:certificate!>
         key: <!{meta.vault}/ssl/server:key!>
+      trusted_certs: ""
       user_management:
         provider: uaa
         uaa:

diff --git a/spec/results/proto-all-params-aws.yml b/spec/results/proto-all-params-aws.yml
@@ -347,6 +347,7 @@ instance_groups:
       ssl:
         cert: <!{meta.vault}/ssl/server:certificate!>
         key: <!{meta.vault}/ssl/server:key!>
+      trusted_certs: ""
       user_management:
         provider: uaa
         uaa:

diff --git a/spec/results/proto-all-params-azure.yml b/spec/results/proto-all-params-azure.yml
@@ -357,6 +357,7 @@ instance_groups:
       ssl:
         cert: <!{meta.vault}/ssl/server:certificate!>
         key: <!{meta.vault}/ssl/server:key!>
+      trusted_certs: ""
       user_management:
         provider: uaa
         uaa:

diff --git a/spec/results/proto-all-params-google.yml b/spec/results/proto-all-params-google.yml
@@ -333,6 +333,7 @@ instance_groups:
       ssl:
         cert: <!{meta.vault}/ssl/server:certificate!>
         key: <!{meta.vault}/ssl/server:key!>
+      trusted_certs: ""
       user_management:
         provider: uaa
         uaa:

diff --git a/spec/results/proto-all-params-source-vsphere.yml b/spec/results/proto-all-params-source-vsphere.yml
@@ -341,6 +341,7 @@ instance_groups:
       ssl:
         cert: <!{meta.vault}/ssl/server:certificate!>
         key: <!{meta.vault}/ssl/server:key!>
+      trusted_certs: ""
       user_management:
         provider: uaa
         uaa:

diff --git a/spec/results/proto-all-params-vsphere.yml b/spec/results/proto-all-params-vsphere.yml
@@ -341,6 +341,7 @@ instance_groups:
       ssl:
         cert: <!{meta.vault}/ssl/server:certificate!>
         key: <!{meta.vault}/ssl/server:key!>
+      trusted_certs: ""
       user_management:
         provider: uaa
         uaa:

diff --git a/spec/results/proto-aws-iam-profile-s3-blobstore-iam-profile.yml b/spec/results/proto-aws-iam-profile-s3-blobstore-iam-profile.yml
@@ -330,6 +330,7 @@ instance_groups:
       ssl:
         cert: <!{meta.vault}/ssl/server:certificate!>
         key: <!{meta.vault}/ssl/server:key!>
+      trusted_certs: ""
       user_management:
         provider: uaa
         uaa:

diff --git a/spec/results/proto-aws-iam-profile-s3-blobstore.yml b/spec/results/proto-aws-iam-profile-s3-blobstore.yml
@@ -332,6 +332,7 @@ instance_groups:
       ssl:
         cert: <!{meta.vault}/ssl/server:certificate!>
         key: <!{meta.vault}/ssl/server:key!>
+      trusted_certs: ""
       user_management:
         provider: uaa
         uaa:

diff --git a/spec/results/proto-aws-iam-profile.yml b/spec/results/proto-aws-iam-profile.yml
@@ -345,6 +345,7 @@ instance_groups:
       ssl:
         cert: <!{meta.vault}/ssl/server:certificate!>
         key: <!{meta.vault}/ssl/server:key!>
+      trusted_certs: ""
       user_management:
         provider: uaa
         uaa:

diff --git a/spec/results/proto-aws-s3-blobstore-iam-profile.yml b/spec/results/proto-aws-s3-blobstore-iam-profile.yml
@@ -331,6 +331,7 @@ instance_groups:
       ssl:
         cert: <!{meta.vault}/ssl/server:certificate!>
         key: <!{meta.vault}/ssl/server:key!>
+      trusted_certs: ""
       user_management:
         provider: uaa
         uaa:

diff --git a/spec/results/proto-aws-s3-blobstore.yml b/spec/results/proto-aws-s3-blobstore.yml
@@ -331,6 +331,7 @@ instance_groups:
       ssl:
         cert: <!{meta.vault}/ssl/server:certificate!>
         key: <!{meta.vault}/ssl/server:key!>
+      trusted_certs: ""
       user_management:
         provider: uaa
         uaa:

diff --git a/spec/results/proto-aws.yml b/spec/results/proto-aws.yml
@@ -347,6 +347,7 @@ instance_groups:
       ssl:
         cert: <!{meta.vault}/ssl/server:certificate!>
         key: <!{meta.vault}/ssl/server:key!>
+      trusted_certs: ""
       user_management:
         provider: uaa
         uaa:

diff --git a/spec/results/proto-azure.yml b/spec/results/proto-azure.yml
@@ -357,6 +357,7 @@ instance_groups:
       ssl:
         cert: <!{meta.vault}/ssl/server:certificate!>
         key: <!{meta.vault}/ssl/server:key!>
+      trusted_certs: ""
       user_management:
         provider: uaa
         uaa:

diff --git a/spec/results/proto-google.yml b/spec/results/proto-google.yml
@@ -333,6 +333,7 @@ instance_groups:
       ssl:
         cert: <!{meta.vault}/ssl/server:certificate!>
         key: <!{meta.vault}/ssl/server:key!>
+      trusted_certs: ""
       user_management:
         provider: uaa
         uaa:

diff --git a/spec/results/proto-openstack.yml b/spec/results/proto-openstack.yml
@@ -343,6 +343,7 @@ instance_groups:
       ssl:
         cert: <!{meta.vault}/ssl/server:certificate!>
         key: <!{meta.vault}/ssl/server:key!>
+      trusted_certs: ""
       user_management:
         provider: uaa
         uaa:

diff --git a/spec/results/proto-vsphere.yml b/spec/results/proto-vsphere.yml
@@ -341,6 +341,7 @@ instance_groups:
       ssl:
         cert: <!{meta.vault}/ssl/server:certificate!>
         key: <!{meta.vault}/ssl/server:key!>
+      trusted_certs: ""
       user_management:
         provider: uaa
         uaa:

diff --git a/spec/results/skip-op-users.yml b/spec/results/skip-op-users.yml
@@ -293,6 +293,7 @@ instance_groups:
       ssl:
         cert: <!{meta.vault}/ssl/server:certificate!>
         key: <!{meta.vault}/ssl/server:key!>
+      trusted_certs: ""
       user_management:
         provider: uaa
         uaa:

diff --git a/spec/results/upgrade.yml b/spec/results/upgrade.yml
@@ -345,6 +345,7 @@ instance_groups:
       ssl:
         cert: <!{meta.vault}/ssl/server:certificate!>
         key: <!{meta.vault}/ssl/server:key!>
+      trusted_certs: ""
       user_management:
         provider: uaa
         uaa:

diff --git a/spec/results/vault-credhub-proxy.yml b/spec/results/vault-credhub-proxy.yml
@@ -317,6 +317,7 @@ instance_groups:
       ssl:
         cert: <!{meta.vault}/ssl/server:certificate!>
         key: <!{meta.vault}/ssl/server:key!>
+      trusted_certs: ""
       user_management:
         provider: uaa
         uaa:

diff --git a/spec/results/vsphere-s3-blobstore.yml b/spec/results/vsphere-s3-blobstore.yml
@@ -291,6 +291,7 @@ instance_groups:
       ssl:
         cert: <!{meta.vault}/ssl/server:certificate!>
         key: <!{meta.vault}/ssl/server:key!>
+      trusted_certs: ""
       user_management:
         provider: uaa
         uaa:

diff --git a/spec/results/vsphere.yml b/spec/results/vsphere.yml
@@ -304,6 +304,7 @@ instance_groups:
       ssl:
         cert: <!{meta.vault}/ssl/server:certificate!>
         key: <!{meta.vault}/ssl/server:key!>
+      trusted_certs: ""
       user_management:
         provider: uaa
         uaa:

diff --git a/spec/results/warden-vsphere.yml b/spec/results/warden-vsphere.yml
@@ -320,6 +320,7 @@ instance_groups:
       ssl:
         cert: <!{meta.vault}/ssl/server:certificate!>
         key: <!{meta.vault}/ssl/server:key!>
+      trusted_certs: ""
       user_management:
         provider: uaa
         uaa: