From 4e906316a4d62243d79ba7a017d41fb3db7bca68 Mon Sep 17 00:00:00 2001
From: James Labocki <jlabocki@redhat.com>
Date: Thu, 18 Sep 2014 09:41:44 -0400
Subject: [PATCH] so I can rebase
---
docker/keystone/keystone.json | 33 ---------------------------------
docker/keystone/start | 3 +++
2 files changed, 3 insertions(+), 33 deletions(-)
delete mode 100644 docker/keystone/keystone.json
diff --git a/docker/keystone/keystone.json b/docker/keystone/keystone.json
deleted file mode 100644
index 4375e333e3..0000000000
--- a/docker/keystone/keystone.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "id": "keystone",
- "desiredState": {
- "manifest": {
- "version": "v1beta1",
- "id": "keystone-1",
- "containers": [{
- "name": "keystone",
- "image": "docker.usersys.redhat.com/jlabocki/keystone",
- "ports": [{
- "containerPort": 80,
- "hostPort": 80
- }],
- "env": [{
- 'name': 'DB_ROOT_PASSWORD',
- 'value': 'password'
- }]
- },
- {
- "name": "mariadb",
- "image": "docker.usersys.redhat.com/lhh1/rhel-osp-mariadb",
- "env": [{
- 'name': 'DB_ROOT_PASSWORD',
- 'value': 'password'
- }]
- }]
- }
- },
- "labels": {
- "name": "keystone"
- }
-}
-
diff --git a/docker/keystone/start b/docker/keystone/start
index bff03803cb..a2789cf0fb 100755
--- a/docker/keystone/start
+++ b/docker/keystone/start
@@ -2,6 +2,9 @@
env > /root/ENV
+
+sleep 1000000
+
socat UNIX-LISTEN:/var/lib/mysql/mysql.sock,fork,reuseaddr,unlink-early,user=mysql,group=mysql,mode=777 TCP:127.0.0.1:3306 &
/usr/bin/openstack-db --service keystone --init --yes --rootpw ${DB_ROOT_PASSWORD} --password redhat