diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-23 07:42:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-23 07:42:15 +0000 |
| commit | 5801e969e1b7dba20644783abaaa5adb7cef4d0d (patch) | |
| tree | d8500d94b5a8580623ad0e43c37c7476b2c4ab62 /docker | |
| parent | aae4016908c06c4fbc60773818b81c21c8b15bde (diff) | |
| parent | 17333aed12775a439dc8d0699bf1811d7160ac55 (diff) | |
| download | kolla-5801e969e1b7dba20644783abaaa5adb7cef4d0d.tar.gz kolla-5801e969e1b7dba20644783abaaa5adb7cef4d0d.zip | |
Merge "Fix keystone for Ubuntu"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/common/keystone/config-external.sh | 11 | ||||
| -rwxr-xr-x | docker/common/keystone/start.sh | 17 |
2 files changed, 22 insertions, 6 deletions
diff --git a/docker/common/keystone/config-external.sh b/docker/common/keystone/config-external.sh index 9742e3b12..1bd4e3bb4 100644 --- a/docker/common/keystone/config-external.sh +++ b/docker/common/keystone/config-external.sh @@ -1,8 +1,6 @@ #!/bin/bash SOURCE="/opt/kolla/keystone/keystone.conf" TARGET="/etc/keystone/keystone.conf" -SOURCE_WSGI="/opt/kolla/keystone/wsgi-keystone.conf" -TARGET_WSGI="/etc/httpd/conf.d/wsgi-keystone.conf" OWNER="keystone" if [[ -f "$SOURCE" ]]; then @@ -11,6 +9,15 @@ if [[ -f "$SOURCE" ]]; then chmod 0644 $TARGET fi +if [[ "${KOLLA_BASE_DISTRO}" == "ubuntu" || \ + "${KOLLA_BASE_DISTRO}" == "debian" ]]; then + SOURCE_WSGI="/opt/kolla/keystone/wsgi-keystone.conf" + TARGET_WSGI="/etc/apache2/conf-enabled/wsgi-keystone.conf" +else + SOURCE_WSGI="/opt/kolla/keystone/wsgi-keystone.conf" + TARGET_WSGI="/etc/httpd/conf.d/wsgi-keystone.conf" +fi + if [[ -f "$SOURCE_WSGI" ]]; then cp $SOURCE_WSGI $TARGET_WSGI chown ${OWNER}: $TARGET_WSGI diff --git a/docker/common/keystone/start.sh b/docker/common/keystone/start.sh index a68995f81..d964b0303 100755 --- a/docker/common/keystone/start.sh +++ b/docker/common/keystone/start.sh @@ -2,12 +2,21 @@ set -o errexit -CMD="/usr/sbin/httpd" -ARGS="-DFOREGROUND" - -# Loading common functions. +# Loading common functions source /opt/kolla/kolla-common.sh +if [[ "${KOLLA_BASE_DISTRO}" == "ubuntu" || \ + "${KOLLA_BASE_DISTRO}" == "debian" ]]; then + CMD="/usr/sbin/apache2" + ARGS="-DFOREGROUND" + + # Loading Apache2 ENV variables + source /etc/apache2/envvars +else + CMD="/usr/sbin/httpd" + ARGS="-DFOREGROUND" +fi + # Execute config strategy set_configs |