From 0824e924a26712819adb0d42a3f809545bb7a749 Mon Sep 17 00:00:00 2001
From: Mohammed Naser <mnaser@vexxhost.com>
Date: Wed, 5 Jun 2024 08:47:55 -0400
Subject: [PATCH] Fix CA mount (#1303)

Signed-off-by: Mohammed Naser <mnaser@vexxhost.com>
---
 roles/defaults/defaults/main.yml | 2 +-
 roles/keystone/vars/main.yml     | 4 ++--
 roles/magnum/vars/main.yml       | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/roles/defaults/defaults/main.yml b/roles/defaults/defaults/main.yml
index 5bc8bd0fb..6adc37be4 100644
--- a/roles/defaults/defaults/main.yml
+++ b/roles/defaults/defaults/main.yml
@@ -25,4 +25,4 @@ atmosphere_network_backend: openvswitch
 atmosphere_image_overrides: {}
 
 defaults_ca_certificates_path: >-
-  {{ '/etc/ssl/certs/ca-certificates.crt' if ansible_facts['os_family'] in ['Debian'] else '/etc/pki/ca-trust/extracted/openssl/ca-bundle.trust.crt' }}"
+  {{ '/etc/ssl/certs/ca-certificates.crt' if ansible_facts['os_family'] in ['Debian'] else '/etc/pki/ca-trust/extracted/openssl/ca-bundle.trust.crt' }}
diff --git a/roles/keystone/vars/main.yml b/roles/keystone/vars/main.yml
index 1b67f80b9..a051576fb 100644
--- a/roles/keystone/vars/main.yml
+++ b/roles/keystone/vars/main.yml
@@ -22,12 +22,12 @@ _keystone_helm_values:
     mounts:
       keystone_api:
         keystone_api:
-          volumeMounts: "{{ keystone_domains | vexxhost.atmosphere.keystone_domains_to_mounts + [{'name': 'etc-ssl-certs', 'mountPath': '/etc/ssl/certs', 'readOnly': true}] }}"
+          volumeMounts: "{{ keystone_domains | vexxhost.atmosphere.keystone_domains_to_mounts + [{'name': 'ca-certificates', 'mountPath': '/etc/ssl/certs/ca-certificates.crt', 'readOnly': true}] }}"
           volumes:
             - name: keystone-openid-metadata
               configMap:
                 name: keystone-openid-metadata
-            - name: etc-ssl-certs
+            - name: ca-certificates
               hostPath:
                 path: "{{ defaults_ca_certificates_path }}"
   conf:
diff --git a/roles/magnum/vars/main.yml b/roles/magnum/vars/main.yml
index 7fd919f2a..cfa67a336 100644
--- a/roles/magnum/vars/main.yml
+++ b/roles/magnum/vars/main.yml
@@ -80,11 +80,11 @@ _magnum_helm_values:
       magnum_conductor:
         magnum_conductor:
           volumeMounts:
-            - name: etc-ssl-certs
-              mountPath: /etc/ssl/certs
+            - name: ca-certificates
+              mountPath: /etc/ssl/certs/ca-certificates.crt
               readOnly: true
           volumes:
-            - name: etc-ssl-certs
+            - name: ca-certificates
               hostPath:
                 path: "{{ defaults_ca_certificates_path }}"
   manifests: