Remove netpol from default scripts

As network policy jobs in zuul are moved to be run by the feature gate,
usage of them in old scripts should be taken out to avoid confusion and
potential problem where netpol cause unexpected connection failure. This
patch set removes the remanant of these netpol's.

Change-Id: I1ce86d27ca4f708b17d848d742ba840156d4ef6c
Signed-off-by: Tin Lam <tin@irrational.io>
This commit is contained in:
Tin Lam 2019-10-04 10:10:26 -05:00 committed by Tin Lam
parent ab0058c1a3
commit f9575748e2
2 changed files with 0 additions and 38 deletions

View File

@ -46,33 +46,6 @@ conf:
pod: pod:
replicas: replicas:
rgw: 1 rgw: 1
network_policy:
ceph:
ingress:
- from:
- podSelector:
matchLabels:
application: glance
- podSelector:
matchLabels:
application: cinder
- podSelector:
matchLabels:
application: libvirt
- podSelector:
matchLabels:
application: nova
- podSelector:
matchLabels:
application: ceph
- podSelector:
matchLabels:
application: ingress
ports:
- protocol: TCP
port: 8088
manifests:
network_policy: true
EOF EOF
helm upgrade --install radosgw-openstack ${HELM_CHART_ROOT_PATH}/ceph-rgw \ helm upgrade --install radosgw-openstack ${HELM_CHART_ROOT_PATH}/ceph-rgw \
--namespace=openstack \ --namespace=openstack \

View File

@ -22,21 +22,10 @@ export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../open
#NOTE: Lint and package chart #NOTE: Lint and package chart
make -C ${HELM_CHART_ROOT_PATH} libvirt make -C ${HELM_CHART_ROOT_PATH} libvirt
tee /tmp/libvirt.yaml <<EOF
manifests:
network_policy: true
network_policy:
libvirt:
ingress:
- {}
EOF
#NOTE: Deploy command #NOTE: Deploy command
: ${OSH_EXTRA_HELM_ARGS:=""} : ${OSH_EXTRA_HELM_ARGS:=""}
helm upgrade --install libvirt ${HELM_CHART_ROOT_PATH}/libvirt \ helm upgrade --install libvirt ${HELM_CHART_ROOT_PATH}/libvirt \
--namespace=openstack \ --namespace=openstack \
--set manifests.network_policy=true \
--values=/tmp/libvirt.yaml \
${OSH_EXTRA_HELM_ARGS} \ ${OSH_EXTRA_HELM_ARGS} \
${OSH_EXTRA_HELM_ARGS_LIBVIRT} ${OSH_EXTRA_HELM_ARGS_LIBVIRT}