diff options
| author | Steven Dake <stdake@cisco.com> | 2015-06-29 13:46:14 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-06-29 14:39:40 -0700 |
| commit | 6370bf25cb3c624067d7327ef54bf2fe654c87be (patch) | |
| tree | 27fad81fa55f26d614806ad88668cb7fdb2ac005 | |
| parent | 0618051a79e9fe84c52e759e0e1267a724f173a5 (diff) | |
| download | kolla-6370bf25cb3c624067d7327ef54bf2fe654c87be.tar.gz kolla-6370bf25cb3c624067d7327ef54bf2fe654c87be.zip | |
Convert keystone from eventlet to httpdliberty-1
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
| -rw-r--r-- | docker/centos/binary/keystone/Dockerfile | 16 | ||||
| -rwxr-xr-x | docker/common/keystone/start.sh | 2 |
2 files changed, 14 insertions, 4 deletions
diff --git a/docker/centos/binary/keystone/Dockerfile b/docker/centos/binary/keystone/Dockerfile index 377ef7b4f..f8db5f582 100644 --- a/docker/centos/binary/keystone/Dockerfile +++ b/docker/centos/binary/keystone/Dockerfile @@ -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"] diff --git a/docker/common/keystone/start.sh b/docker/common/keystone/start.sh index 2eb0f8c48..527870fdf 100755 --- a/docker/common/keystone/start.sh +++ b/docker/common/keystone/start.sh @@ -132,7 +132,7 @@ fi # Start Keystone echo "Starting Keystone" -/usr/bin/keystone-all & +/usr/sbin/httpd -DFOREGROUND & PID=$! # Export Keystone service environment variables |