From d5ec0ed586488b292703e372544498563a744c66 Mon Sep 17 00:00:00 2001
From: Pete Birley <pete@port.direct>
Date: Wed, 1 Aug 2018 10:08:23 -0500
Subject: [PATCH] Gate/Developer: default to newton deployment config in glance

This PS udpates the developer scripts to deploy glance with configuration
that allows operation with heat by default with newton based deployments.

Change-Id: If77ad095c82fc5a28ee3acd3cca295e17f4f7939
Signed-off-by: Pete Birley <pete@port.direct>
---
 tools/deployment/developer/ceph/120-glance.sh | 1 +
 tools/deployment/developer/nfs/120-glance.sh  | 1 +
 tools/deployment/multinode/100-glance.sh      | 1 +
 3 files changed, 3 insertions(+)

diff --git a/tools/deployment/developer/ceph/120-glance.sh b/tools/deployment/developer/ceph/120-glance.sh
index 5e99a5701c..f584ea118e 100755
--- a/tools/deployment/developer/ceph/120-glance.sh
+++ b/tools/deployment/developer/ceph/120-glance.sh
@@ -21,6 +21,7 @@ make glance
 
 #NOTE: Deploy command
 : ${OSH_EXTRA_HELM_ARGS:=""}
+: ${OSH_OPENSTACK_RELEASE:="newton"}
 #NOTE(portdirect), this could be: radosgw, rbd, swift or pvc
 : ${GLANCE_BACKEND:="swift"}
 tee /tmp/glance.yaml <<EOF
diff --git a/tools/deployment/developer/nfs/120-glance.sh b/tools/deployment/developer/nfs/120-glance.sh
index 39553a9d89..e817d20cb5 100755
--- a/tools/deployment/developer/nfs/120-glance.sh
+++ b/tools/deployment/developer/nfs/120-glance.sh
@@ -21,6 +21,7 @@ make glance
 
 #NOTE: Deploy command
 : ${OSH_EXTRA_HELM_ARGS:=""}
+: ${OSH_OPENSTACK_RELEASE:="newton"}
 : ${GLANCE_BACKEND:="pvc"}
 tee /tmp/glance.yaml <<EOF
 storage: ${GLANCE_BACKEND}
diff --git a/tools/deployment/multinode/100-glance.sh b/tools/deployment/multinode/100-glance.sh
index 7d72146a65..4c291dccb4 100755
--- a/tools/deployment/multinode/100-glance.sh
+++ b/tools/deployment/multinode/100-glance.sh
@@ -17,6 +17,7 @@
 set -xe
 
 #NOTE: Deploy command
+: ${OSH_OPENSTACK_RELEASE:="newton"}
 #NOTE(portdirect), this could be: radosgw, rbd, swift or pvc
 : ${GLANCE_BACKEND:="swift"}
 tee /tmp/glance.yaml <<EOF