From edb6ddc2db1cf93211bd43a68097a47c5b455582 Mon Sep 17 00:00:00 2001 From: Dan Smith Date: Thu, 16 Jul 2020 08:14:06 -0700 Subject: [PATCH] Always assume glance is uwsgi mode for grenade Since older devstack versions do not support glance in standalone mode, make grenade configure the base and target for glance deployed with uwsgi. Change-Id: I9ac380aec2689277a2793a67b33b6f9ef8728003 --- .zuul.yaml | 2 ++ devstack.localrc.base | 5 +++++ devstack.localrc.target | 5 +++++ 3 files changed, 12 insertions(+) diff --git a/.zuul.yaml b/.zuul.yaml index de27ea51..c3bc2ed8 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -180,6 +180,8 @@ CELLSV2_SETUP: "singleconductor" # Node specific settings DATABASE_TYPE: mysql + # Glance should always be non-standalone + GLANCE_STANDALONE: False devstack_local_conf: post-config: $NEUTRON_CONF: diff --git a/devstack.localrc.base b/devstack.localrc.base index f34bce77..7f7393d4 100644 --- a/devstack.localrc.base +++ b/devstack.localrc.base @@ -27,3 +27,8 @@ VOLUME_BACKING_FILE_SIZE=10000M enable_service s-account s-container s-object s-proxy SWIFT_HASH=8213897fads879789asdf789 SWIFT_REPLICAS=1 + +# NOTE(danms): Until all recent versions of devstack support +# standalone glance mode, just assume we are upgrading from/to +# Glance as deployed with uwsgi. +GLANCE_STANDALONE=False diff --git a/devstack.localrc.target b/devstack.localrc.target index 804e7ef5..ccb916b9 100644 --- a/devstack.localrc.target +++ b/devstack.localrc.target @@ -27,3 +27,8 @@ VOLUME_BACKING_FILE_SIZE=10000M enable_service s-account s-container s-object s-proxy SWIFT_HASH=8213897fads879789asdf789 SWIFT_REPLICAS=1 + +# NOTE(danms): Until all recent versions of devstack support +# standalone glance mode, just assume we are upgrading from/to +# Glance as deployed with uwsgi. +GLANCE_STANDALONE=False