| commit | 3410e3e01bdbdbfd360d9baebeac081c33ee0821 | [log] [tgz] |
|---|---|---|
| author | Ian Wienand <iwienand@redhat.com> | Wed Jun 21 22:07:53 2017 +1000 |
| committer | Ian Wienand <iwienand@redhat.com> | Thu Jun 22 13:48:06 2017 +1000 |
| tree | 24a8b8cfbbe7b3543b3b64c136a8e14eb1e4336e | |
| parent | 43304849cfde41fa86a6fdd334ab6e703598ef8d [diff] [blame] |
Revert "Use uwsgi for glance-api" This reverts commit e6217a9719b88b550ccbbce7c9bc064cb746c1a3. Unfortunately it seems to break glance; for examples see some of the nodepool dib jobs which have all failed to upload images into glance. Note this has a revert for 43304849cfde41fa86a6fdd334ab6e703598ef8d as well, since that uses GLANCE_URL defined here. [1] http://logs.openstack.org/51/475051/2/gate/gate-dsvm-nodepool-redhat-src/e1bdb34/ [2] http://logs.openstack.org/51/475051/2/gate/gate-dsvm-nodepool-ubuntu-src/6a7665b/ [3] http://logs.openstack.org/51/475051/2/gate/gate-dsvm-nodepool-opensuse-src/b357de1/ Change-Id: I2aea120e733b05e806801121ec994f4e31a337d9
diff --git a/lib/nova b/lib/nova index f56509a..18715fc 100644 --- a/lib/nova +++ b/lib/nova
@@ -575,7 +575,7 @@ # enable notifications, but it will allow them to function when enabled. iniset $NOVA_CONF oslo_messaging_notifications driver "messagingv2" iniset_rpc_backend nova $NOVA_CONF - iniset $NOVA_CONF glance api_servers "$GLANCE_URL" + iniset $NOVA_CONF glance api_servers "${GLANCE_SERVICE_PROTOCOL}://${GLANCE_HOSTPORT}" iniset $NOVA_CONF DEFAULT osapi_compute_workers "$API_WORKERS" iniset $NOVA_CONF DEFAULT metadata_workers "$API_WORKERS"