Better source determination for cf credhub paths

genesis-community · Aug 9, 2023 · 6c71971 · 6c71971
1 parent 96449fa
commit 6c71971
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/overlay/base.yml b/overlay/base.yml
@@ -9,7 +9,7 @@ params:
   network:                 (( grab params.cf_core_network ))
   cf_deployment_env:       (( grab genesis.env )) # assumes same name as cf env
   cf_deployment_type:      cf # for crazy people using an "non-cf" cf deployment named something else
-  cf_deployment_bosh_env:  (( grab genesis.env ))
+  cf_deployment_bosh_env:  (( grab params.cf_deployment_env ))
   cf_deployment_bosh_type: bosh
   cf_core_network:         (( vault meta.cf.exodus ":core_network" ))
   cf_system_domain:        (( vault meta.cf.exodus ":system_domain" ))

diff --git a/spec/credhub/new-cf.yml b/spec/credhub/new-cf.yml
@@ -1,24 +1,24 @@
-/new-cf-bosh/base-test-cf/diego_instance_identity_ca:
+/base-test-bosh/base-test-cf/diego_instance_identity_ca:
   ca: <!{credhub}:diego_instance_identity_ca.ca!>
   certificate: <!{credhub}:diego_instance_identity_ca.certificate!>
   private_key: <!{credhub}:diego_instance_identity_ca.private_key!>
-/new-cf-bosh/base-test-cf/log_cache:
+/base-test-bosh/base-test-cf/log_cache:
   ca: <!{credhub}:log_cache.ca!>
   certificate: <!{credhub}:log_cache.certificate!>
   private_key: <!{credhub}:log_cache.private_key!>
-/new-cf-bosh/base-test-cf/loggregator_ca:
+/base-test-bosh/base-test-cf/loggregator_ca:
   ca: <!{credhub}:loggregator_ca.ca!>
   certificate: <!{credhub}:loggregator_ca.certificate!>
   private_key: <!{credhub}:loggregator_ca.private_key!>
-/new-cf-bosh/base-test-cf/loggregator_tls_agent:
+/base-test-bosh/base-test-cf/loggregator_tls_agent:
   ca: <!{credhub}:loggregator_tls_agent.ca!>
   certificate: <!{credhub}:loggregator_tls_agent.certificate!>
   private_key: <!{credhub}:loggregator_tls_agent.private_key!>
-/new-cf-bosh/base-test-cf/loggregator_tls_rlp:
+/base-test-bosh/base-test-cf/loggregator_tls_rlp:
   ca: <!{credhub}:loggregator_tls_rlp.ca!>
   certificate: <!{credhub}:loggregator_tls_rlp.certificate!>
   private_key: <!{credhub}:loggregator_tls_rlp.private_key!>
-/new-cf-bosh/base-test-cf/nats_client_cert:
+/base-test-bosh/base-test-cf/nats_client_cert:
   ca: <!{credhub}:nats_client_cert.ca!>
   certificate: <!{credhub}:nats_client_cert.certificate!>
   private_key: <!{credhub}:nats_client_cert.private_key!>