Merge "Fix cinder WSGI script path in TLS override"

cinder/templates/bin/_cinder-api.sh.tpl

@@ -19,10 +19,6 @@ COMMAND="${@:-start}"
 
 function start () {
 {{- if .Values.manifests.certificates }}
-  for WSGI_SCRIPT in cinder-wsgi; do
-    cp -a $(type -p ${WSGI_SCRIPT}) /var/www/cgi-bin/cinder/
-  done
-
   if [ -f /etc/apache2/envvars ]; then
     # Loading Apache2 ENV variables
     source /etc/apache2/envvars

cinder/templates/deployment-api.yaml

@@ -123,8 +123,6 @@ spec:
               mountPath: /tmp
             - name: oslo-lock-path
               mountPath: {{ .Values.conf.cinder.oslo_concurrency.lock_path }}
-            - name: wsgi-cinder
-              mountPath: /var/www/cgi-bin/cinder
             - name: cinder-bin
               mountPath: /tmp/cinder-api.sh
               subPath: cinder-api.sh
@@ -191,8 +189,6 @@ spec:
           emptyDir: {}
         - name: oslo-lock-path
           emptyDir: {}
-        - name: wsgi-cinder
-          emptyDir: {}
         - name: cinder-bin
           configMap:
             name: cinder-bin

values_overrides/cinder/tls.yaml

@@ -35,11 +35,14 @@ conf:
   wsgi_cinder: |
     {{- $portInt := tuple "volume" "internal" "api" $ | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
     Listen {{ $portInt }}
+    <Directory /var/lib/openstack/bin>
+        Require all granted
+    </Directory>
     <VirtualHost *:{{ $portInt }}>
       ServerName {{ printf "%s.%s.svc.%s" "cinder-api" .Release.Namespace .Values.endpoints.cluster_domain_suffix }}
       WSGIDaemonProcess cinder-api processes=1 threads=1 user=cinder display-name=%{GROUP}
       WSGIProcessGroup cinder-api
-      WSGIScriptAlias /  /var/www/cgi-bin/cinder/cinder-wsgi
+      WSGIScriptAlias /  /var/lib/openstack/bin/cinder-wsgi
       WSGIApplicationGroup %{GLOBAL}
       WSGIPassAuthorization On
       AllowEncodedSlashes On