From 11597cc2f46f6bd5fdda34e3d6897f6f11188679 Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Thu, 2 Jul 2015 13:09:58 +0000 Subject: Updated keystone for wsgi in config-external This will switch config-external to using wsgi vs evenlet for keystone. Partially Implements: blueprint ansible-service Change-Id: I85a88c813ed36d827916796199dad735b2d44b40 --- docker/common/keystone/config-external.sh | 6 ++++++ docker/common/keystone/start.sh | 12 +++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) (limited to 'docker') diff --git a/docker/common/keystone/config-external.sh b/docker/common/keystone/config-external.sh index 76e4acfff..54df0f3a1 100644 --- a/docker/common/keystone/config-external.sh +++ b/docker/common/keystone/config-external.sh @@ -1,5 +1,11 @@ #!/bin/bash +if [[ -f /opt/kolla/keystone/wsgi-keystone.conf ]]; then + cp /opt/kolla/keystone/wsgi-keystone.conf /etc/httpd/conf.d/ + chown root:keystone /etc/httpd/conf.d/wsgi-keystone.conf + chmod 0644 /etc/httpd/conf.d/wsgi-keystone.conf +fi + if [[ -f /opt/kolla/keystone/keystone.conf ]]; then cp /opt/kolla/keystone/keystone.conf /etc/keystone/keystone.conf chown keystone: /etc/keystone/keystone.conf diff --git a/docker/common/keystone/start.sh b/docker/common/keystone/start.sh index 4dce4c757..a7b2462b3 100755 --- a/docker/common/keystone/start.sh +++ b/docker/common/keystone/start.sh @@ -2,17 +2,19 @@ set -o errexit -CMD="/usr/bin/keystone-all" -ARGS="" +CMD="/usr/sbin/httpd" +ARGS="-DFOREGROUND" -# loading common functions +# Loading common functions. source /opt/kolla/kolla-common.sh +# Config-internal script exec out of this function, it does not return here. set_configs -# Bootstrap and exit if BOOTSTRAP variable is set +# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases +# of the KOLLA_BOOTSTRAP variable being set, including empty. if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then - su -c "keystone-manage db_sync" keystone + su -s /bin/sh -c "keystone-manage db_sync" keystone exit 0 fi -- cgit v1.2.3