Image-Agnostic: Keystone

This PS helps improve the Image agnosticism of the Keystone chart.

This is achieved by removing the presumed locations of the Keystone
WSGI scripts, enabling support for images that either do not use a venv
or the same venv location that Kolla uses.

Change-Id: Id04f5e485d6a421b6ac7464cbb14f0e3819b778d

keystone/templates/bin/_keystone-api.sh.tpl

@@ -19,6 +19,11 @@ set -ex
 COMMAND="${@:-start}"
 
 function start () {
+
+  for KEYSTONE_WSGI_SCRIPT in keystone-wsgi-public keystone-wsgi-admin; do
+    cp -a $(type -p ${KEYSTONE_WSGI_SCRIPT}) /var/www/cgi-bin/keystone/
+  done
+
   if [ -f /etc/apache2/envvars ]; then
      # Loading Apache2 ENV variables
      source /etc/apache2/envvars

keystone/templates/deployment.yaml

@@ -78,6 +78,8 @@ spec:
           volumeMounts:
           - name: etckeystone
             mountPath: /etc/keystone
+          - name: wsgi-keystone
+            mountPath: /var/www/cgi-bin/keystone
           - name: keystone-etc
             mountPath: /etc/keystone/keystone.conf
             subPath: keystone.conf
@@ -110,6 +112,8 @@ spec:
       volumes:
       - name: etckeystone
         emptyDir: {}
+      - name: wsgi-keystone
+        emptyDir: {}
       - name: keystone-etc
         configMap:
           name: keystone-etc

keystone/templates/etc/_wsgi-keystone.conf.tpl

@@ -21,7 +21,7 @@ LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-A
 <VirtualHost *:{{ .Values.network.api.port }}>
     WSGIDaemonProcess keystone-public processes=1 threads=4 user=keystone group=keystone display-name=%{GROUP}
     WSGIProcessGroup keystone-public
-    WSGIScriptAlias / /var/www/cgi-bin/keystone/main
+    WSGIScriptAlias / /var/www/cgi-bin/keystone/keystone-wsgi-public
     WSGIApplicationGroup %{GLOBAL}
     WSGIPassAuthorization On
     <IfVersion >= 2.4>
@@ -37,7 +37,7 @@ LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-A
 <VirtualHost *:{{ .Values.network.admin.port }}>
     WSGIDaemonProcess keystone-admin processes=1 threads=4 user=keystone group=keystone display-name=%{GROUP}
     WSGIProcessGroup keystone-admin
-    WSGIScriptAlias / /var/www/cgi-bin/keystone/admin
+    WSGIScriptAlias / /var/www/cgi-bin/keystone/keystone-wsgi-admin
     WSGIApplicationGroup %{GLOBAL}
     WSGIPassAuthorization On
     <IfVersion >= 2.4>