diff options
| author | Lars Kellogg-Stedman <lars@redhat.com> | 2014-10-05 09:54:53 -0400 |
|---|---|---|
| committer | Lars Kellogg-Stedman <lars@redhat.com> | 2014-10-07 12:49:23 -0400 |
| commit | d28f83dace10de52cc54d019a05a27859115fbdc (patch) | |
| tree | d7642b7d26d7bb0e1a30ca5dd9d8693b0574d7d5 /docker/glance/glance-api | |
| parent | 3c080f9e62ffc6c75c64ba0d86167fbeb2d83a35 (diff) | |
| download | kolla-d28f83dace10de52cc54d019a05a27859115fbdc.tar.gz kolla-d28f83dace10de52cc54d019a05a27859115fbdc.zip | |
fix issues with glance scripts
- glance was using wrong var name for admin_password
- also missing "\" in several places, breaking multi-line crudini
commands.
- glance was using wrong tenant name
- in the registry container, glance-manage appears to reference
glance-api.conf
- the glance.json config file was not spawning a registry container
Change-Id: I280d1db3ed576988f2bf29ea665e1922a37f8752
Diffstat (limited to 'docker/glance/glance-api')
| -rwxr-xr-x | docker/glance/glance-api/start.sh | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/docker/glance/glance-api/start.sh b/docker/glance/glance-api/start.sh index dbd1ae2e9..81cd51909 100755 --- a/docker/glance/glance-api/start.sh +++ b/docker/glance/glance-api/start.sh @@ -1,5 +1,23 @@ #!/bin/sh -sh /opt/glance/config-glance.sh api +if ! [ "$KEYSTONE_ADMIN_TOKEN" ]; then + echo "*** Missing KEYSTONE_ADMIN_TOKEN" >&2 + exit 1 +fi + +. /opt/glance/config-glance.sh + +export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}" +export SERVICE_ENDPOINT="http://${KEYSTONE_ADMIN_PORT_35357_TCP_ADDR}:35357/v2.0" + +crux user-create -n "${GLANCE_KEYSTONE_USER}" \ + -p "${GLANCE_KEYSTONE_PASSWORD}" \ + -t "${ADMIN_TENANT_NAME}" \ + -r admin + +crux endpoint-create -n glance -t image \ + -I "http://${GLANCE_API_PORT_9292_TCP_ADDR}:9292" \ + -P "http://${PUBLIC_IP}:9292" \ + -A "http://${GLANCE_API_PORT_9292_TCP_ADDR}:9292" exec /usr/bin/glance-api |