Merge "Glance: disable V1 API and registry"

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
@@ -863,9 +865,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
@@ -878,7 +880,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
@@ -886,6 +888,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

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}

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}
 

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}
 

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 \