From 60b9ffa262491fec5f72116374e7cc46f0453c0a Mon Sep 17 00:00:00 2001
From: Lars Kellogg-Stedman <lars@redhat.com>
Date: Thu, 18 Sep 2014 13:09:35 -0400
Subject: re-create dockerfile that was on server and not committed

---
 docker/keystone/Dockerfile | 19 +++----------------
 docker/keystone/start      | 41 -----------------------------------------
 docker/keystone/start.sh   | 41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 57 deletions(-)
 delete mode 100755 docker/keystone/start
 create mode 100755 docker/keystone/start.sh

(limited to 'docker')

diff --git a/docker/keystone/Dockerfile b/docker/keystone/Dockerfile
index 5eb45d814..3cd378ce3 100644
--- a/docker/keystone/Dockerfile
+++ b/docker/keystone/Dockerfile
@@ -1,23 +1,10 @@
 FROM rhel7
 MAINTAINER jlabocki@redhat.com
 
-# This Dockerfile installs the components of Keystone in a docker image as a proof of concept
-RUN date > /root/date
-
 #Install required packages
 RUN yum install -y wget procps-ng net-tools && yum clean all
-RUN yum install -y openstack-keystone openstack-utils openstack-selinux mariadb-galera-server socat && yum clean all
-
-#Service token stuff
-RUN export SERVICE_TOKEN=$(/usr/bin/openssl rand -hex 10) && /usr/bin/echo $SERVICE_TOKEN > /root/ks_admin_token && openstack-config --set /etc/keystone/keystone.conf DEFAULT admin_token $SERVICE_TOKEN && echo "export SERVICE_TOKEN=`cat /root/ks_admin_token`" > /root/ks_admin && echo "export SERVICE_ENDPOINT=\"http://127.0.0.1:35357/v2.0\"" >> /root/ks_admin
-
-#Eventually use rabbitmq-server (externally, but who knows, this might work too some day)
-#RUN yum install -y rabbitmq-server
-#RUN yum install -y mariadb-galera-server
-
-#Eventually use optimizied systemd for containers and use this to enable the service and start it
-#RUN yum install systemd-container
+RUN yum install -y openstack-keystone openstack-utils openstack-selinux && yum clean all
 
-ADD ./start /usr/bin/run
+ADD ./start.sh /start.sh
 
-CMD ["/usr/bin/run"]
+CMD ["/start.sh"]
diff --git a/docker/keystone/start b/docker/keystone/start
deleted file mode 100755
index 2fcb91317..000000000
--- a/docker/keystone/start
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash -e
-
-: ${KEYSTONE_DB_PASSWORD:=keystone}
-: ${KEYSTONE_ADMIN_PASSWORD:=redhat}
-
-if ! [ "$KEYSTONE_ADMIN_TOKEN" ]; then
-	KEYSTONE_ADMIN_TOKEN=$(openssl -hex 15)
-fi
-
-/usr/bin/openstack-db --service keystone --init --yes --rootpw ${DB_ROOT_PASSWORD} --password ${KEYSTONE_DB_PASSWORD}
-
-crudini --set /etc/keystone/keystone.conf \
-	database \
-	connection \
-	"mysql://keystone:${KEYSTONE_DB_PASSWORD}@${MARIADBMASTER_PORT_3306_TCP_ADDR}:MARIADBMASTER_PORT_3306_TCP_PORT/keystone"
-
-crudini --set /etc/keystone/keystone.conf \
-	DEFAULT \
-	admin_token \
-	"${KEYSTONE_ADMIN_TOKEN}"
-
-/usr/bin/keystone-manage db_sync
-
-/usr/bin/keystone-all &
-PID=$!
-
-/bin/sleep 5
-
-export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}"
-export SERVICE_ENDPOINT="http://127.0.0.1:35357/v2.0"
-
-/bin/keystone user-create --name admin --pass ${KEYSTONE_ADMIN_PASSWORD}
-/bin/keystone role-create --name admin
-/bin/keystone tenant-create --name admin
-/bin/keystone user-role-add --user admin --role admin --tenant admin
-
-kill -TERM $PID
-
-
-echo "Exec-ing keystone-all.."
-exec /usr/bin/keystone-all
diff --git a/docker/keystone/start.sh b/docker/keystone/start.sh
new file mode 100755
index 000000000..2fcb91317
--- /dev/null
+++ b/docker/keystone/start.sh
@@ -0,0 +1,41 @@
+#!/bin/bash -e
+
+: ${KEYSTONE_DB_PASSWORD:=keystone}
+: ${KEYSTONE_ADMIN_PASSWORD:=redhat}
+
+if ! [ "$KEYSTONE_ADMIN_TOKEN" ]; then
+	KEYSTONE_ADMIN_TOKEN=$(openssl -hex 15)
+fi
+
+/usr/bin/openstack-db --service keystone --init --yes --rootpw ${DB_ROOT_PASSWORD} --password ${KEYSTONE_DB_PASSWORD}
+
+crudini --set /etc/keystone/keystone.conf \
+	database \
+	connection \
+	"mysql://keystone:${KEYSTONE_DB_PASSWORD}@${MARIADBMASTER_PORT_3306_TCP_ADDR}:MARIADBMASTER_PORT_3306_TCP_PORT/keystone"
+
+crudini --set /etc/keystone/keystone.conf \
+	DEFAULT \
+	admin_token \
+	"${KEYSTONE_ADMIN_TOKEN}"
+
+/usr/bin/keystone-manage db_sync
+
+/usr/bin/keystone-all &
+PID=$!
+
+/bin/sleep 5
+
+export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}"
+export SERVICE_ENDPOINT="http://127.0.0.1:35357/v2.0"
+
+/bin/keystone user-create --name admin --pass ${KEYSTONE_ADMIN_PASSWORD}
+/bin/keystone role-create --name admin
+/bin/keystone tenant-create --name admin
+/bin/keystone user-role-add --user admin --role admin --tenant admin
+
+kill -TERM $PID
+
+
+echo "Exec-ing keystone-all.."
+exec /usr/bin/keystone-all
-- 
cgit v1.2.3