diff options
| author | Lars Kellogg-Stedman <lars@oddbit.com> | 2014-09-29 09:48:59 -0400 |
|---|---|---|
| committer | Lars Kellogg-Stedman <lars@oddbit.com> | 2014-09-29 09:48:59 -0400 |
| commit | 03558bf5ef75985e271580b4731d579bd7022976 (patch) | |
| tree | 3ff999dce5b7f747cb5261e13f1aa7910e37c823 /docker/keystone | |
| parent | 6d1f2086b267f08a39810d92253d2988132f43d5 (diff) | |
| parent | a7b17d70a3ecd6c2b5a76a846c812482d8e46e08 (diff) | |
| download | kolla-03558bf5ef75985e271580b4731d579bd7022976.tar.gz kolla-03558bf5ef75985e271580b4731d579bd7022976.zip | |
Merge pull request #8 from sdake/master
build and push to kollaglue account
Diffstat (limited to 'docker/keystone')
| -rwxr-xr-x | docker/keystone/build | 2 | ||||
| -rw-r--r-- | docker/keystone/keystone.json | 2 | ||||
| -rwxr-xr-x | docker/keystone/push | 2 | ||||
| -rwxr-xr-x | docker/keystone/start.sh | 5 |
4 files changed, 9 insertions, 2 deletions
diff --git a/docker/keystone/build b/docker/keystone/build index a92662c05..a1b40c837 100755 --- a/docker/keystone/build +++ b/docker/keystone/build @@ -1,2 +1,2 @@ #!/bin/bash -docker build --tag fedora-rdo-keystone . +docker build --tag kollaglue/fedora-rdo-keystone . diff --git a/docker/keystone/keystone.json b/docker/keystone/keystone.json index 89adcd31b..2f707583d 100644 --- a/docker/keystone/keystone.json +++ b/docker/keystone/keystone.json @@ -6,7 +6,7 @@ "id": "keystone-1", "containers": [{ "name": "keystone", - "image": "docker.usersys.redhat.com/jlabocki/keystone", + "image": "kollaglue/fedora-rdo-keystone", "ports": [ {"containerPort": 5000}, {"containerPort": 35357}, diff --git a/docker/keystone/push b/docker/keystone/push new file mode 100755 index 000000000..5e7bc88cb --- /dev/null +++ b/docker/keystone/push @@ -0,0 +1,2 @@ +#!/bin/bash +docker push kollaglue/fedora-rdo-keystone . diff --git a/docker/keystone/start.sh b/docker/keystone/start.sh index a1425fb08..044cf4725 100755 --- a/docker/keystone/start.sh +++ b/docker/keystone/start.sh @@ -31,9 +31,14 @@ 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 + +cat /etc/keystone/keystone.conf /usr/bin/keystone-manage db_sync +/usr/bin/keystone-manage pki_setup --keystone-user keystone --keystone-group keystone + /usr/bin/keystone-all & PID=$! |
