openstack/kolla-ansible
Code Issues Proposed changes

Convert keystone from eventlet to httpd

Browse Source 
eventlet in master (Delorean) has had a regression making Keystone
not work well with it.  Instead, we have decided to switch to the
recommended deployment model using httpd.

Change-Id: Ie5407ae4fab9882b301925ddfa1b065923bbd52f
Closes-Bug: #1469851
This commit is contained in:
Steven Dake 2015-06-29 13:46:14 -07:00
parent 0618051a79
commit 6370bf25cb
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
docker/centos/binary/keystone/Dockerfile
View File

@ -1,14 +1,24 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
#Install required packages
RUN yum -y install openstack-keystone \
python-keystoneclient \
httpd \
mod_wsgi \
&& yum clean all
RUN mkdir -p /var/www/cgi-bin/keystone
RUN cp -a /usr/share/keystone/wsgi-keystone.conf /etc/httpd/conf.d
RUN sed -i 's,/var/log/apache2,/var/log/httpd,' /etc/httpd/conf.d/wsgi-keystone.conf
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf
RUN cp -a /usr/share/keystone/keystone.wsgi /var/www/cgi-bin/keystone/main
RUN cp -a /usr/share/keystone/keystone.wsgi /var/www/cgi-bin/keystone/admin
RUN chown -R keystone:keystone /var/www/cgi-bin/keystone
RUN chmod 755 /var/www/cgi-bin/keystone/*
# Add start-up and check scripts
ADD ./start.sh /start.sh
ADD ./check.sh /check.sh
COPY ./start.sh /start.sh
COPY ./check.sh /check.sh
# Run the Keystone start script
CMD ["/start.sh"]

2
docker/common/keystone/start.sh
View File

@ -132,7 +132,7 @@ fi
# Start Keystone
echo "Starting Keystone"
/usr/bin/keystone-all &
/usr/sbin/httpd -DFOREGROUND &
PID=$!
# Export Keystone service environment variables