aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorSteven Dake <stdake@cisco.com>2016-02-14 07:43:45 -0700
committerSteven Dake <stdake@cisco.com>2016-02-14 08:59:11 -0700
commit03568ce863f84da54d7e52af996d4f48c1c5c387 (patch)
treeed56123cd969c72c3794270b4d01588d9f54acc1 /docker
parent50b885c260430029e05edb477dcd3b7d0ed6d754 (diff)
downloadkolla-03568ce863f84da54d7e52af996d4f48c1c5c387.tar.gz
kolla-03568ce863f84da54d7e52af996d4f48c1c5c387.zip
Install keystone-dist-paste.ini in /etc/keystone
The CentOS packages install a default version of the paste file but don't install them in the /etc directory. Kolla doesn't configure the paste files, so this file never gets setup properly. With the recent change in Keystone around the default admin_token being changed, this triggered Keystone to return a 401 Auth error. A follow-on patch from Sam edits this file, and that patch breaks the build without this dependent patch. TrivialFix Change-Id: Ib1568e186bdd7d19b7e5af151388197755902488
Diffstat (limited to 'docker')
-rw-r--r--docker/keystone/Dockerfile.j21
1 files changed, 1 insertions, 0 deletions
diff --git a/docker/keystone/Dockerfile.j2 b/docker/keystone/Dockerfile.j2
index 9d1fe298c..fa36801bc 100644
--- a/docker/keystone/Dockerfile.j2
+++ b/docker/keystone/Dockerfile.j2
@@ -11,6 +11,7 @@ RUN yum -y install openstack-keystone \
&& yum clean all
RUN mkdir -p /var/www/cgi-bin/keystone \
+ && cp -a /usr/share/keystone/keystone-dist-paste.ini /etc/keystone/keystone-paste.ini \
&& cp -a /usr/share/keystone/keystone.wsgi /var/www/cgi-bin/keystone/main \
&& cp -a /usr/share/keystone/keystone.wsgi /var/www/cgi-bin/keystone/admin \
&& sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf