Merge branch 'master' of github.com:att-comdev/aic-helm

keystone/templates/bin-configmap.yaml

@@ -7,5 +7,3 @@ data:
 {{ tuple "bin/_db-sync.sh.tpl" . | include "template" | indent 4 }}
   init.sh: |
 {{ tuple "bin/_init.sh.tpl" . | include "template" | indent 4 }}
-  start.sh: |
-{{ tuple "bin/_start.sh.tpl" . | include "template" | indent 4 }}

keystone/templates/bin/_start.sh.tpl

@@ -1,12 +0,0 @@
-#!/bin/bash
-set -ex
-
-# link our keystone wsgi to apaches running config
-ln -s /configmaps/wsgi-keystone.conf /etc/apache2/sites-enabled/wsgi-keystone.conf
-
-# Loading Apache2 ENV variables
-source /etc/apache2/envvars
-rm -rf /var/run/apache2/*
-APACHE_DIR="apache2"
-
-apache2 -DFOREGROUND

keystone/templates/deployment.yaml

@@ -44,8 +44,8 @@ spec:
         - name: keystone-api
           image: {{ .Values.images.api }}
           command:
-            - bash
+            - apache2
-            - /tmp/start.sh
+            - -DFOREGROUND
           ports:
             - containerPort: {{ .Values.network.port.public }}
             - containerPort: {{ .Values.network.port.admin }}
@@ -57,14 +57,11 @@ spec:
               mountPath: /etc/keystone/keystone.conf
               subPath: keystone.conf
             - name: wsgikeystone
-              mountPath: /configmaps/wsgi-keystone.conf
+              mountPath: /etc/apache2/conf-enabled/wsgi-keystone.conf
               subPath: wsgi_keystone.conf
             - name: mpmeventconf
               mountPath: /etc/apache2/mods-available/mpm_event.conf
               subPath: mpm_event.conf
-            - name: startsh
-              mountPath: /tmp/start.sh
-              subPath: start.sh
       volumes:
         - name: keystoneconf
           configMap:
@@ -84,6 +81,3 @@ spec:
             items:
             - key: mpm-event.conf
               path: mpm_event.conf
-        - name: startsh
-          configMap:
-            name: keystone-bin