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.json | |
| 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.json')
| -rw-r--r-- | docker/glance/glance.json | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/docker/glance/glance.json b/docker/glance/glance.json index 26f31d24f..94da934c6 100644 --- a/docker/glance/glance.json +++ b/docker/glance/glance.json @@ -1,18 +1,8 @@ { - "id": "glance", "desiredState": { "manifest": { - "version": "v1beta1", - "id": "glance-1", "containers": [ { - "name": "glance-registry", - "image": "kollaglue/fedora-rdo-glance-registry", - "ports": [ - { - "containerPort": 9191 - } - ], "env": [ { "name": "DB_ROOT_PASSWORD", @@ -20,22 +10,22 @@ }, { "name": "GLANCE_DB_PASSWORD", - "value": "glancedbpassword" + "value": "password" }, { "name": "KEYSTONE_ADMIN_TOKEN", "value": "ADMINTOKEN" } - ] - }, - { - "name": "glance-api", - "image": "kollaglue/fedora-rdo-glance-api", + ], + "image": "kollaglue/fedora-rdo-glance-registry", + "name": "glance-registry", "ports": [ { - "containerPort": 9292 + "containerPort": 9191 } - ], + ] + }, + { "env": [ { "name": "DB_ROOT_PASSWORD", @@ -43,18 +33,28 @@ }, { "name": "GLANCE_DB_PASSWORD", - "value": "glancedbpassword" + "value": "password" }, { "name": "KEYSTONE_ADMIN_TOKEN", "value": "ADMINTOKEN" } + ], + "image": "kollaglue/fedora-rdo-glance-api", + "name": "glance-api", + "ports": [ + { + "containerPort": 9292 + } ] } - ] + ], + "id": "glance-1", + "version": "v1beta1" } }, + "id": "glance", "labels": { - "name": "glance-master" + "name": "glance" } } |
