diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-20 18:00:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-20 18:00:05 +0000 |
| commit | c90b3a676384fc4c7d0e12eb1e3186a14a360208 (patch) | |
| tree | 58c4787dbcb1fdc2c463245a653afaf254f4ba8d /docker | |
| parent | 959fcd1c99e6a39a0c033141a002da00b1bd9a3c (diff) | |
| parent | 684873b89b81245acff8310b208807389d44b7d6 (diff) | |
| download | kolla-c90b3a676384fc4c7d0e12eb1e3186a14a360208.tar.gz kolla-c90b3a676384fc4c7d0e12eb1e3186a14a360208.zip | |
Merge "Make Heka collect Keystone logs"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/keystone/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/keystone/extend_start.sh | 24 |
2 files changed, 26 insertions, 1 deletions
diff --git a/docker/keystone/Dockerfile.j2 b/docker/keystone/Dockerfile.j2 index b00b72a5f..7bb280125 100644 --- a/docker/keystone/Dockerfile.j2 +++ b/docker/keystone/Dockerfile.j2 @@ -66,7 +66,8 @@ RUN ln -s keystone-source/* keystone \ # TODO(SamYaple): Replace this with `keystone-manage bootstrap` RUN sed -i 's|token_auth json_body|token_auth admin_token_auth json_body|g' /etc/keystone/keystone-paste.ini -RUN chown -R keystone: /var/www/cgi-bin/keystone \ +RUN usermod -a -G kolla keystone \ + && chown -R keystone: /var/www/cgi-bin/keystone \ && chmod 755 /var/www/cgi-bin/keystone/* COPY extend_start.sh /usr/local/bin/kolla_extend_start diff --git a/docker/keystone/extend_start.sh b/docker/keystone/extend_start.sh index c13ebfa0b..5dd166534 100644 --- a/docker/keystone/extend_start.sh +++ b/docker/keystone/extend_start.sh @@ -4,6 +4,9 @@ if [[ "${KOLLA_BASE_DISTRO}" == "ubuntu" || \ "${KOLLA_BASE_DISTRO}" == "debian" ]]; then # Loading Apache2 ENV variables source /etc/apache2/envvars + APACHE_DIR="apache2" +else + APACHE_DIR="httpd" fi # NOTE(pbourke): httpd will not clean up after itself in some cases which @@ -13,6 +16,27 @@ if [[ "${KOLLA_BASE_DISTRO}" =~ fedora|centos|oraclelinux|rhel ]]; then rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd* fi +# Create log dir for Keystone logs +KEYSTONE_LOG_DIR="/var/log/kolla/keystone" +if [[ ! -d "${KEYSTONE_LOG_DIR}" ]]; then + mkdir -p ${KEYSTONE_LOG_DIR} +fi +if [[ $(stat -c %U:%G ${KEYSTONE_LOG_DIR}) != "keystone:kolla" ]]; then + chown keystone:kolla ${KEYSTONE_LOG_DIR} +fi +if [[ $(stat -c %a ${KEYSTONE_LOG_DIR}) != "755" ]]; then + chmod 755 ${KEYSTONE_LOG_DIR} +fi + +# Create log dir for Apache logs +APACHE_LOG_DIR="/var/log/kolla/${APACHE_DIR}" +if [[ ! -d "${APACHE_LOG_DIR}" ]]; then + mkdir -p ${APACHE_LOG_DIR} +fi +if [[ $(stat -c %a ${APACHE_LOG_DIR}) != "755" ]]; then + chmod 755 ${APACHE_LOG_DIR} +fi + # 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 |