From 664bdc8a1e1dcd5f5585da742847b915d795ff18 Mon Sep 17 00:00:00 2001
From: Pete Birley <pete@port.direct>
Date: Thu, 26 Jul 2018 18:01:53 -0500
Subject: [PATCH] Glance: disable V1 API and registry

This PS disables the depreciated glance V1 API and registry
by default. For newton gates the registry is enabled, as newton
heat still used it.

Change-Id: Ia6bd4382750bde1b0a0e4db174d2de11626a1826
Signed-off-by: Pete Birley <pete@port.direct>
---
 glance/values.yaml                            | 10 +++++----
 .../armada/multinode/armada-osh.yaml          | 11 ++++++++++
 tools/deployment/developer/ceph/120-glance.sh | 20 +++++++++++++++++-
 tools/deployment/developer/nfs/120-glance.sh  | 21 ++++++++++++++++++-
 tools/deployment/multinode/100-glance.sh      | 20 ++++++++++++++++--
 5 files changed, 74 insertions(+), 8 deletions(-)

diff --git a/glance/values.yaml b/glance/values.yaml
index ec2a06daca..79a61c2e66 100644
--- a/glance/values.yaml
+++ b/glance/values.yaml
@@ -226,6 +226,8 @@ conf:
       # via the endpoints section.
       bind_port: null
       workers: 1
+      enable_v1_api: False
+      enable_v2_registry: False
     keystone_authtoken:
       auth_type: password
       auth_version: v3
@@ -864,9 +866,9 @@ manifests:
   configmap_bin: true
   configmap_etc: true
   deployment_api: true
-  deployment_registry: true
+  deployment_registry: false
   ingress_api: true
-  ingress_registry: true
+  ingress_registry: false
   job_bootstrap: true
   job_clean: true
   job_db_init: true
@@ -879,7 +881,7 @@ manifests:
   job_storage_init: true
   job_rabbit_init: true
   pdb_api: true
-  pdb_registry: true
+  pdb_registry: false
   pod_rally_test: true
   pvc_images: true
   secret_db: true
@@ -887,6 +889,6 @@ manifests:
   secret_keystone: true
   secret_rabbitmq: true
   service_ingress_api: true
-  service_ingress_registry: true
+  service_ingress_registry: false
   service_api: true
   service_registry: true
diff --git a/tools/deployment/armada/multinode/armada-osh.yaml b/tools/deployment/armada/multinode/armada-osh.yaml
index 7ff538cbf7..5fd3f64224 100644
--- a/tools/deployment/armada/multinode/armada-osh.yaml
+++ b/tools/deployment/armada/multinode/armada-osh.yaml
@@ -516,6 +516,17 @@ data:
       replicas:
         api: 2
         registry: 2
+    # NOTE(portdirect): glance APIv1 is required for heat in Newton
+    conf:
+      glance:
+        DEFAULT:
+          enable_v1_api: true
+          enable_v2_registry: true
+    manifests:
+      deployment_registry: true
+      ingress_registry: true
+      pdb_registry: true
+      service_ingress_registry: true
   source:
     type: local
     location: ${OSH_PATH}
diff --git a/tools/deployment/developer/ceph/120-glance.sh b/tools/deployment/developer/ceph/120-glance.sh
index 01b9867278..5e99a5701c 100755
--- a/tools/deployment/developer/ceph/120-glance.sh
+++ b/tools/deployment/developer/ceph/120-glance.sh
@@ -23,9 +23,27 @@ make glance
 : ${OSH_EXTRA_HELM_ARGS:=""}
 #NOTE(portdirect), this could be: radosgw, rbd, swift or pvc
 : ${GLANCE_BACKEND:="swift"}
+tee /tmp/glance.yaml <<EOF
+storage: ${GLANCE_BACKEND}
+EOF
+if [ "x${OSH_OPENSTACK_RELEASE}" == "xnewton" ]; then
+# NOTE(portdirect): glance APIv1 is required for heat in Newton
+  tee -a /tmp/glance.yaml <<EOF
+conf:
+  glance:
+    DEFAULT:
+      enable_v1_api: true
+      enable_v2_registry: true
+manifests:
+  deployment_registry: true
+  ingress_registry: true
+  pdb_registry: true
+  service_ingress_registry: true
+EOF
+fi
 helm upgrade --install glance ./glance \
   --namespace=openstack \
-  --set storage=${GLANCE_BACKEND} \
+  --values=/tmp/glance.yaml \
   ${OSH_EXTRA_HELM_ARGS} \
   ${OSH_EXTRA_HELM_ARGS_GLANCE}
 
diff --git a/tools/deployment/developer/nfs/120-glance.sh b/tools/deployment/developer/nfs/120-glance.sh
index 3be380ddfb..39553a9d89 100755
--- a/tools/deployment/developer/nfs/120-glance.sh
+++ b/tools/deployment/developer/nfs/120-glance.sh
@@ -21,9 +21,28 @@ make glance
 
 #NOTE: Deploy command
 : ${OSH_EXTRA_HELM_ARGS:=""}
+: ${GLANCE_BACKEND:="pvc"}
+tee /tmp/glance.yaml <<EOF
+storage: ${GLANCE_BACKEND}
+EOF
+if [ "x${OSH_OPENSTACK_RELEASE}" == "xnewton" ]; then
+# NOTE(portdirect): glance APIv1 is required for heat in Newton
+  tee -a /tmp/glance.yaml <<EOF
+conf:
+  glance:
+    DEFAULT:
+      enable_v1_api: true
+      enable_v2_registry: true
+manifests:
+  deployment_registry: true
+  ingress_registry: true
+  pdb_registry: true
+  service_ingress_registry: true
+EOF
+fi
 helm upgrade --install glance ./glance \
   --namespace=openstack \
-  --set storage=pvc \
+  --values=/tmp/glance.yaml \
   ${OSH_EXTRA_HELM_ARGS} \
   ${OSH_EXTRA_HELM_ARGS_GLANCE}
 
diff --git a/tools/deployment/multinode/100-glance.sh b/tools/deployment/multinode/100-glance.sh
index 2ab5ec8595..7d72146a65 100755
--- a/tools/deployment/multinode/100-glance.sh
+++ b/tools/deployment/multinode/100-glance.sh
@@ -17,14 +17,30 @@
 set -xe
 
 #NOTE: Deploy command
-GLANCE_BACKEND="radosgw" # NOTE(portdirect), this could be: radosgw, rbd, swift or pvc
-tee /tmp/glance.yaml << EOF
+#NOTE(portdirect), this could be: radosgw, rbd, swift or pvc
+: ${GLANCE_BACKEND:="swift"}
+tee /tmp/glance.yaml <<EOF
 storage: ${GLANCE_BACKEND}
 pod:
   replicas:
     api: 2
     registry: 2
 EOF
+if [ "x${OSH_OPENSTACK_RELEASE}" == "xnewton" ]; then
+# NOTE(portdirect): glance APIv1 is required for heat in Newton
+  tee -a /tmp/glance.yaml <<EOF
+conf:
+  glance:
+    DEFAULT:
+      enable_v1_api: true
+      enable_v2_registry: true
+manifests:
+  deployment_registry: true
+  ingress_registry: true
+  pdb_registry: true
+  service_ingress_registry: true
+EOF
+fi
 helm upgrade --install glance ./glance \
   --namespace=openstack \
   --values=/tmp/glance.yaml \