diff options
| author | James Labocki <jlabocki@redhat.com> | 2014-09-18 09:41:44 -0400 |
|---|---|---|
| committer | James Labocki <jlabocki@redhat.com> | 2014-09-18 09:41:44 -0400 |
| commit | 4e906316a4d62243d79ba7a017d41fb3db7bca68 (patch) | |
| tree | 9066576505216dcd38d8bd359a8a161f6c331235 | |
| parent | decff743aaf11a020715c6644b509fd9f186ecca (diff) | |
| download | kolla-4e906316a4d62243d79ba7a017d41fb3db7bca68.tar.gz kolla-4e906316a4d62243d79ba7a017d41fb3db7bca68.zip | |
so I can rebase
| -rw-r--r-- | docker/keystone/keystone.json | 33 | ||||
| -rwxr-xr-x | docker/keystone/start | 3 |
2 files changed, 3 insertions, 33 deletions
diff --git a/docker/keystone/keystone.json b/docker/keystone/keystone.json deleted file mode 100644 index 4375e333e..000000000 --- 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 bff03803c..a2789cf0f 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 |