From 03568ce863f84da54d7e52af996d4f48c1c5c387 Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Sun, 14 Feb 2016 07:43:45 -0700
Subject: [PATCH] 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
---
 docker/keystone/Dockerfile.j2 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker/keystone/Dockerfile.j2 b/docker/keystone/Dockerfile.j2
index 9d1fe298c2..fa36801bcc 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