diff options
| author | Ryan Hallisey <rhallise@redhat.com> | 2015-03-10 17:04:38 -0400 |
|---|---|---|
| committer | Ryan Hallisey <rhallise@redhat.com> | 2015-03-10 18:04:44 -0400 |
| commit | a2dae48b87ccbd1b772d495f35a03af50b58958d (patch) | |
| tree | bca7f1a80c667bf5b08165e84ab0da743901806f /docker/glance | |
| parent | 797960bf2608ae27773a0f2aa3ba8a47265fba66 (diff) | |
| download | kolla-a2dae48b87ccbd1b772d495f35a03af50b58958d.tar.gz kolla-a2dae48b87ccbd1b772d495f35a03af50b58958d.zip | |
Glance containers need to be changed so they work without kubernetes
This patch overlaps a little bit with https://review.openstack.org/#/c/162358/.
There were some additional glance config that needs to be added to run without
kubernetes.
Co-authored by: Charles Crouch (charcrou@cisco.com)
Change-Id: I1aab2f6e4a80aaf1e6c4b7fe330bcf9a7740fdc6
Diffstat (limited to 'docker/glance')
| -rwxr-xr-x | docker/glance/glance-api/start.sh | 27 | ||||
| -rw-r--r-- | docker/glance/glance-base/config-glance.sh | 4 | ||||
| -rw-r--r-- | docker/glance/glance-registry/Dockerfile | 3 | ||||
| -rwxr-xr-x | docker/glance/glance-registry/start.sh | 2 |
4 files changed, 32 insertions, 4 deletions
diff --git a/docker/glance/glance-api/start.sh b/docker/glance/glance-api/start.sh index c94db2ebc..851835449 100755 --- a/docker/glance/glance-api/start.sh +++ b/docker/glance/glance-api/start.sh @@ -4,11 +4,17 @@ set -e . /opt/kolla/kolla-common.sh . /opt/kolla/config-glance.sh +: ${GLANCE_API_SERVICE_HOST:=$PUBLIC_IP} check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \ GLANCE_KEYSTONE_USER GLANCE_KEYSTONE_PASSWORD \ ADMIN_TENANT_NAME GLANCE_API_SERVICE_HOST \ PUBLIC_IP + +/opt/kolla/wait_for 30 1 keystone \ + --os-auth-url=http://${KEYSTONE_PUBLIC_SERVICE_HOST}:35357/v2.0 \ + --os-username=admin --os-tenant-name=${ADMIN_TENANT_NAME} \ + --os-password=${KEYSTONE_ADMIN_PASSWORD} endpoint-list check_for_keystone export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}" @@ -26,4 +32,25 @@ crux endpoint-create --remove-all \ -P "http://${PUBLIC_IP}:9292" \ -A "http://${GLANCE_API_SERVICE_HOST}:9292" +# turn on notification sending by glance +crudini --set /etc/glance/glance-api.conf \ + DEFAULT \ + notification_driver \ + "messaging" + +crudini --set /etc/glance/glance-api.conf \ + DEFAULT \ + rabbit_host \ + "${RABBITMQ_SERVICE_HOST}" + +crudini --set /etc/glance/glance-api.conf \ + DEFAULT \ + registry_host \ + "${GLANCE_REGISTRY_SERVICE_HOST}" + +crudini --set /etc/glance/glance-api.conf \ + DEFAULT \ + debug \ + "True" + exec /usr/bin/glance-api diff --git a/docker/glance/glance-base/config-glance.sh b/docker/glance/glance-base/config-glance.sh index 2a6e54caa..a6380e5c8 100644 --- a/docker/glance/glance-base/config-glance.sh +++ b/docker/glance/glance-base/config-glance.sh @@ -11,9 +11,7 @@ set -e : ${KEYSTONE_AUTH_PROTOCOL:=http} : ${PUBLIC_IP:=$GLANCE_API_PORT_9292_TCP_ADDR} -check_for_db -check_required_vars GLANCE_DB_PASSWORD GLANCE_KEYSTONE_PASSWORD \ - KEYSTONE_PUBLIC_SERVICE_HOST +check_required_vars GLANCE_DB_PASSWORD GLANCE_KEYSTONE_PASSWORD dump_vars cat > /openrc <<EOF diff --git a/docker/glance/glance-registry/Dockerfile b/docker/glance/glance-registry/Dockerfile index fc8442516..2510f8eb0 100644 --- a/docker/glance/glance-registry/Dockerfile +++ b/docker/glance/glance-registry/Dockerfile @@ -1,6 +1,7 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base MAINTAINER Kolla Project (https://launchpad.net/kolla) +EXPOSE 9191 + ADD ./start.sh /start.sh CMD ["/start.sh"] - diff --git a/docker/glance/glance-registry/start.sh b/docker/glance/glance-registry/start.sh index 5521d5b7e..865e60b87 100755 --- a/docker/glance/glance-registry/start.sh +++ b/docker/glance/glance-registry/start.sh @@ -6,6 +6,8 @@ set -e . /opt/kolla/config-glance.sh check_required_vars GLANCE_DB_NAME GLANCE_DB_USER GLANCE_DB_PASSWORD +# lets wait for the DB to be available +./opt/kolla/wait_for 25 1 mysql -h ${MARIADB_SERVICE_HOST} -u root -p"${DB_ROOT_PASSWORD}" -e 'status;' check_for_db mysql -h ${MARIADB_SERVICE_HOST} -u root -p${DB_ROOT_PASSWORD} mysql <<EOF |