From fc5be700a3508d2596d43ed5f17365e2fa5bba19 Mon Sep 17 00:00:00 2001
From: Gage Hugo <gagehugo@gmail.com>
Date: Tue, 3 Sep 2019 15:12:10 -0500
Subject: [PATCH] Remove network policy override from memcache script

This change removes the network policy overrides that are set in
the common memcache setup script. These override will be implemented
in a future change as part of the rest of the network policy work.

Change-Id: I8954b6d88a650a576208e33b6e6e6ef00bdbef66
---
 tools/deployment/common/memcached.sh | 55 ----------------------------
 1 file changed, 55 deletions(-)

diff --git a/tools/deployment/common/memcached.sh b/tools/deployment/common/memcached.sh
index 0aeeb59fcd..5891a6a298 100755
--- a/tools/deployment/common/memcached.sh
+++ b/tools/deployment/common/memcached.sh
@@ -20,65 +20,10 @@ set -xe
 : ${OSH_INFRA_PATH:="../openstack-helm-infra"}
 make -C ${OSH_INFRA_PATH} memcached
 
-tee /tmp/memcached.yaml <<EOF
-manifests:
-  network_policy: true
-network_policy:
-  memcached:
-    ingress:
-      - from:
-        - podSelector:
-            matchLabels:
-              application: keystone
-        - podSelector:
-            matchLabels:
-              application: heat
-        - podSelector:
-            matchLabels:
-              application: glance
-        - podSelector:
-            matchLabels:
-              application: cinder
-        - podSelector:
-            matchLabels:
-              application: congress
-        - podSelector:
-            matchLabels:
-              application: barbican
-        - podSelector:
-            matchLabels:
-              application: ceilometer
-        - podSelector:
-            matchLabels:
-              application: horizon
-        - podSelector:
-            matchLabels:
-              application: ironic
-        - podSelector:
-            matchLabels:
-              application: magnum
-        - podSelector:
-            matchLabels:
-              application: mistral
-        - podSelector:
-            matchLabels:
-              application: nova
-        - podSelector:
-            matchLabels:
-              application: neutron
-        - podSelector:
-            matchLabels:
-              application: senlin
-        ports:
-        - protocol: TCP
-          port: 11211
-EOF
-
 #NOTE: Deploy command
 : ${OSH_EXTRA_HELM_ARGS:=""}
 helm upgrade --install memcached ${OSH_INFRA_PATH}/memcached \
     --namespace=openstack \
-    --values=/tmp/memcached.yaml \
     ${OSH_EXTRA_HELM_ARGS} \
     ${OSH_EXTRA_HELM_ARGS_MEMCACHED}