From 4f35570a46df04f47bb404852216b9417f35499c Mon Sep 17 00:00:00 2001
From: Gage Hugo <gagehugo@gmail.com>
Date: Mon, 3 Jun 2019 15:26:20 -0500
Subject: [PATCH] Remove network-policy overrides default scripts

This change removes the network policy overrides from the default
developer deployment scripts now that there is a set of
designated scripts that provide this functionality.

Change-Id: I788845e85314b3a8a9c860fbc77de536113781e0
---
 .../developer/common/030-ingress.sh           | 55 ---------------
 .../developer/common/050-mariadb.sh           | 68 -------------------
 .../developer/common/060-rabbitmq.sh          | 65 ------------------
 .../developer/common/080-keystone.sh          |  1 -
 tools/deployment/developer/common/090-heat.sh |  1 -
 .../developer/common/100-horizon.sh           |  1 -
 .../developer/common/140-openvswitch.sh       |  1 -
 tools/deployment/developer/nfs/120-glance.sh  |  1 -
 tools/deployment/developer/nfs/150-libvirt.sh | 11 ---
 .../developer/nfs/160-compute-kit.sh          |  3 -
 10 files changed, 207 deletions(-)

diff --git a/tools/deployment/developer/common/030-ingress.sh b/tools/deployment/developer/common/030-ingress.sh
index dc09a38e62..c57536c784 100755
--- a/tools/deployment/developer/common/030-ingress.sh
+++ b/tools/deployment/developer/common/030-ingress.sh
@@ -20,60 +20,6 @@ set -xe
 : ${OSH_INFRA_PATH:="../openstack-helm-infra"}
 make -C ${OSH_INFRA_PATH} ingress
 
-tee /tmp/ingress.yaml <<EOF
-manifests:
-  network_policy: true
-network_policy:
-  ingress:
-    ingress:
-      - from:
-        - podSelector:
-            matchLabels:
-              application: ceph
-        - 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
-EOF
-
 #NOTE: Deploy command
 : ${OSH_INFRA_PATH:="../openstack-helm-infra"}
 : ${OSH_EXTRA_HELM_ARGS:=""}
@@ -99,7 +45,6 @@ helm status ingress-kube-system
 #NOTE: Deploy namespace ingress
 helm upgrade --install ingress-openstack ${OSH_INFRA_PATH}/ingress \
   --namespace=openstack \
-  --values=/tmp/ingress.yaml \
   ${OSH_EXTRA_HELM_ARGS} \
   ${OSH_EXTRA_HELM_ARGS_INGRESS_OPENSTACK}
 
diff --git a/tools/deployment/developer/common/050-mariadb.sh b/tools/deployment/developer/common/050-mariadb.sh
index c5507e3dc9..9ff190356a 100755
--- a/tools/deployment/developer/common/050-mariadb.sh
+++ b/tools/deployment/developer/common/050-mariadb.sh
@@ -20,78 +20,10 @@ set -xe
 : ${OSH_INFRA_PATH:="../openstack-helm-infra"}
 make -C ${OSH_INFRA_PATH} mariadb
 
-tee /tmp/mariadb.yaml <<EOF
-manifests:
-  network_policy: true
-network_policy:
-  mariadb:
-    ingress:
-      - from:
-        - podSelector:
-            matchLabels:
-              application: mariadb
-        - 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
-        - podSelector:
-            matchLabels:
-              application: mariadb-backup
-        - podSelector:
-            matchLabels:
-              application: prometheus-mysql-exporter
-        ports:
-        - protocol: TCP
-          port: 3306
-        - protocol: TCP
-          port: 4567
-        - protocol: TCP
-          port: 80
-EOF
-
 #NOTE: Deploy command
 : ${OSH_EXTRA_HELM_ARGS:=""}
 helm upgrade --install mariadb ${OSH_INFRA_PATH}/mariadb \
     --namespace=openstack \
-    --values=/tmp/mariadb.yaml \
     --set pod.replicas.server=1 \
     ${OSH_EXTRA_HELM_ARGS} \
     ${OSH_EXTRA_HELM_ARGS_MARIADB}
diff --git a/tools/deployment/developer/common/060-rabbitmq.sh b/tools/deployment/developer/common/060-rabbitmq.sh
index f601111f0e..605cb91926 100755
--- a/tools/deployment/developer/common/060-rabbitmq.sh
+++ b/tools/deployment/developer/common/060-rabbitmq.sh
@@ -20,75 +20,10 @@ set -xe
 : ${OSH_INFRA_PATH:="../openstack-helm-infra"}
 make -C ${OSH_INFRA_PATH} rabbitmq
 
-
-tee /tmp/rabbitmq.yaml <<EOF
-manifests:
-  network_policy: true
-network_policy:
-  rabbitmq:
-    ingress:
-      - from:
-        - podSelector:
-            matchLabels:
-              application: rabbitmq
-        - 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: 5672
-        - protocol: TCP
-          port: 15672
-        - protocol: TCP
-          port: 25672
-        - protocol: TCP
-          port: 20000
-EOF
-
 #NOTE: Deploy command
 : ${OSH_EXTRA_HELM_ARGS:=""}
 helm upgrade --install rabbitmq ${OSH_INFRA_PATH}/rabbitmq \
     --namespace=openstack \
-    --values=/tmp/rabbitmq.yaml \
     --set pod.replicas.server=1 \
     ${OSH_EXTRA_HELM_ARGS} \
     ${OSH_EXTRA_HELM_ARGS_RABBITMQ}
diff --git a/tools/deployment/developer/common/080-keystone.sh b/tools/deployment/developer/common/080-keystone.sh
index 88112df71a..c19aec70fd 100755
--- a/tools/deployment/developer/common/080-keystone.sh
+++ b/tools/deployment/developer/common/080-keystone.sh
@@ -23,7 +23,6 @@ make keystone
 : ${OSH_EXTRA_HELM_ARGS:=""}
 helm upgrade --install keystone ./keystone \
     --namespace=openstack \
-    --set manifests.network_policy=true \
     ${OSH_EXTRA_HELM_ARGS} \
     ${OSH_EXTRA_HELM_ARGS_KEYSTONE}
 
diff --git a/tools/deployment/developer/common/090-heat.sh b/tools/deployment/developer/common/090-heat.sh
index ea48c409f8..e1b92622fe 100755
--- a/tools/deployment/developer/common/090-heat.sh
+++ b/tools/deployment/developer/common/090-heat.sh
@@ -22,7 +22,6 @@ make heat
 : ${OSH_EXTRA_HELM_ARGS:=""}
 helm upgrade --install heat ./heat \
   --namespace=openstack \
-  --set manifests.network_policy=true \
   ${OSH_EXTRA_HELM_ARGS} \
   ${OSH_EXTRA_HELM_ARGS_HEAT}
 
diff --git a/tools/deployment/developer/common/100-horizon.sh b/tools/deployment/developer/common/100-horizon.sh
index 02beb2b60a..3c241310df 100755
--- a/tools/deployment/developer/common/100-horizon.sh
+++ b/tools/deployment/developer/common/100-horizon.sh
@@ -25,7 +25,6 @@ helm upgrade --install horizon ./horizon \
     --namespace=openstack \
     --set network.node_port.enabled=true \
     --set network.node_port.port=31000 \
-    --set manifests.network_policy=true \
     ${OSH_EXTRA_HELM_ARGS} \
     ${OSH_EXTRA_HELM_ARGS_HORIZON}
 
diff --git a/tools/deployment/developer/common/140-openvswitch.sh b/tools/deployment/developer/common/140-openvswitch.sh
index 51c7abf866..c54f2c1d01 100755
--- a/tools/deployment/developer/common/140-openvswitch.sh
+++ b/tools/deployment/developer/common/140-openvswitch.sh
@@ -23,7 +23,6 @@ make -C ${OSH_INFRA_PATH} openvswitch
 : ${OSH_EXTRA_HELM_ARGS:=""}
 helm upgrade --install openvswitch ${OSH_INFRA_PATH}/openvswitch \
   --namespace=openstack \
-  --set manifests.network_policy=true \
   ${OSH_EXTRA_HELM_ARGS} \
   ${OSH_EXTRA_HELM_ARGS_OPENVSWITCH}
 
diff --git a/tools/deployment/developer/nfs/120-glance.sh b/tools/deployment/developer/nfs/120-glance.sh
index d9d3fa12f2..845ff5a3c7 100755
--- a/tools/deployment/developer/nfs/120-glance.sh
+++ b/tools/deployment/developer/nfs/120-glance.sh
@@ -45,7 +45,6 @@ fi
 helm upgrade --install glance ./glance \
   --namespace=openstack \
   --values=/tmp/glance.yaml \
-  --set manifests.network_policy=true \
   ${OSH_EXTRA_HELM_ARGS} \
   ${OSH_EXTRA_HELM_ARGS_GLANCE}
 
diff --git a/tools/deployment/developer/nfs/150-libvirt.sh b/tools/deployment/developer/nfs/150-libvirt.sh
index 9159be7ffc..d746b7f496 100755
--- a/tools/deployment/developer/nfs/150-libvirt.sh
+++ b/tools/deployment/developer/nfs/150-libvirt.sh
@@ -19,22 +19,11 @@ set -xe
 : ${OSH_INFRA_PATH:="../openstack-helm-infra"}
 make -C ${OSH_INFRA_PATH} libvirt
 
-tee /tmp/libvirt.yaml <<EOF
-manifests:
-  network_policy: true
-network_policy:
-  libvirt:
-    ingress:
-      - {}
-EOF
-
 #NOTE: Deploy command
 : ${OSH_EXTRA_HELM_ARGS:=""}
 helm upgrade --install libvirt ${OSH_INFRA_PATH}/libvirt \
   --namespace=openstack \
   --set conf.ceph.enabled=false \
-  --set manifests.network_policy=true \
-  --values=/tmp/libvirt.yaml \
   ${OSH_EXTRA_HELM_ARGS} \
   ${OSH_EXTRA_HELM_ARGS_LIBVIRT}
 
diff --git a/tools/deployment/developer/nfs/160-compute-kit.sh b/tools/deployment/developer/nfs/160-compute-kit.sh
index 66cea174e8..7e2a7fd162 100755
--- a/tools/deployment/developer/nfs/160-compute-kit.sh
+++ b/tools/deployment/developer/nfs/160-compute-kit.sh
@@ -26,7 +26,6 @@ if [ "x$(systemd-detect-virt)" == "xnone" ]; then
   helm upgrade --install nova ./nova \
       --namespace=openstack \
       --set conf.ceph.enabled=false \
-      --set manifests.network_policy=true \
       ${OSH_EXTRA_HELM_ARGS} \
       ${OSH_EXTRA_HELM_ARGS_NOVA}
 else
@@ -36,7 +35,6 @@ else
       --set conf.ceph.enabled=false \
       --set conf.nova.libvirt.virt_type=qemu \
       --set conf.nova.libvirt.cpu_mode=none \
-      --set manifests.network_policy=true \
       ${OSH_EXTRA_HELM_ARGS} \
       ${OSH_EXTRA_HELM_ARGS_NOVA}
 fi
@@ -69,7 +67,6 @@ EOF
 helm upgrade --install neutron ./neutron \
     --namespace=openstack \
     --values=/tmp/neutron.yaml \
-    --set manifests.network_policy=true \
     ${OSH_EXTRA_HELM_ARGS} \
     ${OSH_EXTRA_HELM_ARGS_NEUTRON}