From 1e6f8114c85b8dff4630bf11f6179d0e52e5dedf Mon Sep 17 00:00:00 2001
From: Steven Dake <sdake@redhat.com>
Date: Sat, 27 Sep 2014 16:03:02 -0700
Subject: [PATCH] Setup pki_setup on initial setup of keystone

Need PKI setup for keystone to operate.
---
 docker/keystone/Dockerfile | 2 --
 docker/keystone/start.sh   | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docker/keystone/Dockerfile b/docker/keystone/Dockerfile
index 8319c0cf7c..922511c955 100644
--- a/docker/keystone/Dockerfile
+++ b/docker/keystone/Dockerfile
@@ -7,8 +7,6 @@ RUN yum install -y openstack-keystone \
 	mariadb \
 	&& yum clean all
 
-RUN crudini --set /etc/keystone/keystone.conf DEFAULT use_stderr True
-
 ADD ./start.sh /start.sh
 
 CMD ["/start.sh"]
diff --git a/docker/keystone/start.sh b/docker/keystone/start.sh
index a1425fb089..130afe11a2 100755
--- a/docker/keystone/start.sh
+++ b/docker/keystone/start.sh
@@ -31,9 +31,12 @@ crudini --del /etc/keystone/keystone.conf \
 crudini --del /etc/keystone/keystone.conf \
 	DEFAULT \
 	log_dir
+crudini --set /etc/keystone/keystone.conf DEFAULT use_stderr True
 
 /usr/bin/keystone-manage db_sync
 
+/usr/bin/keystone-manage pki_setup
+
 /usr/bin/keystone-all &
 PID=$!