diff options
| author | Lars Kellogg-Stedman <lars@redhat.com> | 2014-10-08 12:48:31 -0400 |
|---|---|---|
| committer | Lars Kellogg-Stedman <lars@redhat.com> | 2014-10-13 09:53:56 -0400 |
| commit | a4069300aa285c747846c2aa47d514a282297a65 (patch) | |
| tree | 7b19670bd62bf3094dcb529c924600d77105c64d /k8s | |
| parent | cb05bb513bc5dbb2aa0a10a569ee5032515ea382 (diff) | |
| download | kolla-a4069300aa285c747846c2aa47d514a282297a65.tar.gz kolla-a4069300aa285c747846c2aa47d514a282297a65.zip | |
correct various issues with glance images and configs
- update keystone endpoints/user on boot (to avoid problems caused by,
e.g., a stale password or invalid endpoint urls)
- require GLANCE_DB_PASSWORD and GLANCE_KEYSTONE_PASSWORD in the
environment, since we start multiple containers
Change-Id: I31214b81280ed34409f92e79003c1116d5737d2e
Diffstat (limited to 'k8s')
| -rw-r--r-- | k8s/pod/glance-pod.json | 120 |
1 files changed, 64 insertions, 56 deletions
diff --git a/k8s/pod/glance-pod.json b/k8s/pod/glance-pod.json index 94da934c6..359de4bf2 100644 --- a/k8s/pod/glance-pod.json +++ b/k8s/pod/glance-pod.json @@ -1,60 +1,68 @@ { - "desiredState": { - "manifest": { - "containers": [ - { - "env": [ - { - "name": "DB_ROOT_PASSWORD", - "value": "password" - }, - { - "name": "GLANCE_DB_PASSWORD", - "value": "password" - }, - { - "name": "KEYSTONE_ADMIN_TOKEN", - "value": "ADMINTOKEN" - } - ], - "image": "kollaglue/fedora-rdo-glance-registry", - "name": "glance-registry", - "ports": [ - { - "containerPort": 9191 - } - ] - }, - { - "env": [ - { - "name": "DB_ROOT_PASSWORD", - "value": "password" - }, - { - "name": "GLANCE_DB_PASSWORD", - "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" + "labels": { + "name": "glance" + }, + "id": "glance", + "desiredState": { + "manifest": { + "version": "v1beta1", + "id": "glance-1", + "containers": [ + { + "ports": [ + { + "containerPort": 9191 + } + ], + "name": "glance-registry", + "image": "kollaglue/fedora-rdo-glance-registry", + "env": [ + { + "value": "password", + "name": "DB_ROOT_PASSWORD" + }, + { + "value": "password", + "name": "GLANCE_DB_PASSWORD" + }, + { + "value": "password", + "name": "GLANCE_KEYSTONE_PASSWORD" + }, + { + "value": "ADMINTOKEN", + "name": "KEYSTONE_ADMIN_TOKEN" + } + ] + }, + { + "ports": [ + { + "containerPort": 9292 + } + ], + "name": "glance-api", + "image": "kollaglue/fedora-rdo-glance-api", + "env": [ + { + "value": "password", + "name": "DB_ROOT_PASSWORD" + }, + { + "value": "password", + "name": "GLANCE_DB_PASSWORD" + }, + { + "value": "password", + "name": "GLANCE_KEYSTONE_PASSWORD" + }, + { + "value": "ADMINTOKEN", + "name": "KEYSTONE_ADMIN_TOKEN" + } + ] } - }, - "id": "glance", - "labels": { - "name": "glance" + ] } + } } |