From f97e644aa6701933041118b1a3fa6da6356c1667 Mon Sep 17 00:00:00 2001
From: Steve Wilkerson <wilkers.steve@gmail.com>
Date: Mon, 1 Oct 2018 09:14:46 -0500
Subject: [PATCH] Glance: Disable registry service template in manifests

This updates the glance chart to disable the service for the
glance registry by default, as we disable the other glance
registry templates by default. This updates the gates to enable
the service when newton is deployed

Change-Id: I453d28d9c552754b66e94d9da2e2b9ea6549a5aa
---
 glance/values.yaml                                | 2 +-
 tools/deployment/armada/multinode/armada-osh.yaml | 1 +
 tools/deployment/developer/ceph/120-glance.sh     | 1 +
 tools/deployment/developer/nfs/120-glance.sh      | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/glance/values.yaml b/glance/values.yaml
index 18c6b55010..20f31725c5 100644
--- a/glance/values.yaml
+++ b/glance/values.yaml
@@ -894,4 +894,4 @@ manifests:
   service_ingress_api: true
   service_ingress_registry: false
   service_api: true
-  service_registry: true
+  service_registry: false
diff --git a/tools/deployment/armada/multinode/armada-osh.yaml b/tools/deployment/armada/multinode/armada-osh.yaml
index 406b7a93f4..89a36413fd 100644
--- a/tools/deployment/armada/multinode/armada-osh.yaml
+++ b/tools/deployment/armada/multinode/armada-osh.yaml
@@ -527,6 +527,7 @@ data:
       ingress_registry: true
       pdb_registry: true
       service_ingress_registry: true
+      service_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 f584ea118e..ff120bf8bb 100755
--- a/tools/deployment/developer/ceph/120-glance.sh
+++ b/tools/deployment/developer/ceph/120-glance.sh
@@ -40,6 +40,7 @@ manifests:
   ingress_registry: true
   pdb_registry: true
   service_ingress_registry: true
+  service_registry: true
 EOF
 fi
 helm upgrade --install glance ./glance \
diff --git a/tools/deployment/developer/nfs/120-glance.sh b/tools/deployment/developer/nfs/120-glance.sh
index e817d20cb5..845ff5a3c7 100755
--- a/tools/deployment/developer/nfs/120-glance.sh
+++ b/tools/deployment/developer/nfs/120-glance.sh
@@ -39,6 +39,7 @@ manifests:
   ingress_registry: true
   pdb_registry: true
   service_ingress_registry: true
+  service_registry: true
 EOF
 fi
 helm upgrade --install glance ./glance \