From 3581d443a42fb716a34a5bac270d546e51cb8959 Mon Sep 17 00:00:00 2001
From: DTadrzak <daniel.tadrzak@intel.com>
Date: Wed, 14 Dec 2016 15:12:13 +0100
Subject: [PATCH] Keystone trivial fix

Fixed: mount path for mp-event.conf and wsgi-keystone.conf
Deleted: unnecessary start.sh file

Signed-off-by: DTadrzak <daniel.tadrzak@intel.com>
---
 keystone/templates/bin-configmap.yaml |  2 --
 keystone/templates/bin/_start.sh.tpl  | 12 ------------
 keystone/templates/deployment.yaml    | 12 +++---------
 3 files changed, 3 insertions(+), 23 deletions(-)
 delete mode 100644 keystone/templates/bin/_start.sh.tpl

diff --git a/keystone/templates/bin-configmap.yaml b/keystone/templates/bin-configmap.yaml
index 76e0f7cf14..ea514e46fa 100644
--- a/keystone/templates/bin-configmap.yaml
+++ b/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 }}
diff --git a/keystone/templates/bin/_start.sh.tpl b/keystone/templates/bin/_start.sh.tpl
deleted file mode 100644
index 7c802358bc..0000000000
--- a/keystone/templates/bin/_start.sh.tpl
+++ /dev/null
@@ -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
diff --git a/keystone/templates/deployment.yaml b/keystone/templates/deployment.yaml
index 3bb6027ee4..d4ebbaa3e6 100644
--- a/keystone/templates/deployment.yaml
+++ b/keystone/templates/deployment.yaml
@@ -44,8 +44,8 @@ spec:
         - name: keystone-api
           image: {{ .Values.images.api }}
           command:
-            - bash
-            - /tmp/start.sh
+            - apache2
+            - -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