aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorSteven Dake <sdake@redhat.com>2014-09-27 16:03:02 -0700
committerSteven Dake <sdake@redhat.com>2014-09-27 16:03:02 -0700
commit1e6f8114c85b8dff4630bf11f6179d0e52e5dedf (patch)
treea13c80b041a62613250fc6503a72ca8c7ed015e8 /docker
parent9c7f0622a712bb95986636a3b7764018195ab815 (diff)
downloadkolla-1e6f8114c85b8dff4630bf11f6179d0e52e5dedf.tar.gz
kolla-1e6f8114c85b8dff4630bf11f6179d0e52e5dedf.zip
Setup pki_setup on initial setup of keystone
Need PKI setup for keystone to operate.
Diffstat (limited to 'docker')
-rw-r--r--docker/keystone/Dockerfile2
-rwxr-xr-xdocker/keystone/start.sh3
2 files changed, 3 insertions, 2 deletions
diff --git a/docker/keystone/Dockerfile b/docker/keystone/Dockerfile
index 8319c0cf7..922511c95 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 a1425fb08..130afe11a 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=$!