openstack/openstack-helm
Code Issues Proposed changes

Remove network-policy overrides default scripts

Browse Source 
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
This commit is contained in:
Gage Hugo 2019-06-03 15:26:20 -05:00
parent 4ec3d501b3
commit 4f35570a46
10 changed files with 0 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
tools/deployment/developer/common/030-ingress.sh
View File

@ -20,60 +20,6 @@ set -xe
: ${OSH_INFRA_PATH:="../openstack-helm-infra"} : ${OSH_INFRA_PATH:="../openstack-helm-infra"}
make -C ${OSH_INFRA_PATH} ingress 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 #NOTE: Deploy command
: ${OSH_INFRA_PATH:="../openstack-helm-infra"} : ${OSH_INFRA_PATH:="../openstack-helm-infra"}
: ${OSH_EXTRA_HELM_ARGS:=""} : ${OSH_EXTRA_HELM_ARGS:=""}
@ -99,7 +45,6 @@ helm status ingress-kube-system
#NOTE: Deploy namespace ingress #NOTE: Deploy namespace ingress
helm upgrade --install ingress-openstack ${OSH_INFRA_PATH}/ingress \ helm upgrade --install ingress-openstack ${OSH_INFRA_PATH}/ingress \
--namespace=openstack \ --namespace=openstack \
--values=/tmp/ingress.yaml \
${OSH_EXTRA_HELM_ARGS} \ ${OSH_EXTRA_HELM_ARGS} \
${OSH_EXTRA_HELM_ARGS_INGRESS_OPENSTACK} ${OSH_EXTRA_HELM_ARGS_INGRESS_OPENSTACK}

68
tools/deployment/developer/common/050-mariadb.sh
View File

@ -20,78 +20,10 @@ set -xe
: ${OSH_INFRA_PATH:="../openstack-helm-infra"} : ${OSH_INFRA_PATH:="../openstack-helm-infra"}
make -C ${OSH_INFRA_PATH} mariadb 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 #NOTE: Deploy command
: ${OSH_EXTRA_HELM_ARGS:=""} : ${OSH_EXTRA_HELM_ARGS:=""}
helm upgrade --install mariadb ${OSH_INFRA_PATH}/mariadb \ helm upgrade --install mariadb ${OSH_INFRA_PATH}/mariadb \
--namespace=openstack \ --namespace=openstack \
--values=/tmp/mariadb.yaml \
--set pod.replicas.server=1 \ --set pod.replicas.server=1 \
${OSH_EXTRA_HELM_ARGS} \ ${OSH_EXTRA_HELM_ARGS} \
${OSH_EXTRA_HELM_ARGS_MARIADB} ${OSH_EXTRA_HELM_ARGS_MARIADB}

65
tools/deployment/developer/common/060-rabbitmq.sh
View File

@ -20,75 +20,10 @@ set -xe
: ${OSH_INFRA_PATH:="../openstack-helm-infra"} : ${OSH_INFRA_PATH:="../openstack-helm-infra"}
make -C ${OSH_INFRA_PATH} rabbitmq 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 #NOTE: Deploy command
: ${OSH_EXTRA_HELM_ARGS:=""} : ${OSH_EXTRA_HELM_ARGS:=""}
helm upgrade --install rabbitmq ${OSH_INFRA_PATH}/rabbitmq \ helm upgrade --install rabbitmq ${OSH_INFRA_PATH}/rabbitmq \
--namespace=openstack \ --namespace=openstack \
--values=/tmp/rabbitmq.yaml \
--set pod.replicas.server=1 \ --set pod.replicas.server=1 \
${OSH_EXTRA_HELM_ARGS} \ ${OSH_EXTRA_HELM_ARGS} \
${OSH_EXTRA_HELM_ARGS_RABBITMQ} ${OSH_EXTRA_HELM_ARGS_RABBITMQ}

1
tools/deployment/developer/common/080-keystone.sh
View File

@ -23,7 +23,6 @@ make keystone
: ${OSH_EXTRA_HELM_ARGS:=""} : ${OSH_EXTRA_HELM_ARGS:=""}
helm upgrade --install keystone ./keystone \ helm upgrade --install keystone ./keystone \
--namespace=openstack \ --namespace=openstack \
--set manifests.network_policy=true \
${OSH_EXTRA_HELM_ARGS} \ ${OSH_EXTRA_HELM_ARGS} \
${OSH_EXTRA_HELM_ARGS_KEYSTONE} ${OSH_EXTRA_HELM_ARGS_KEYSTONE}

1
tools/deployment/developer/common/090-heat.sh
View File

@ -22,7 +22,6 @@ make heat
: ${OSH_EXTRA_HELM_ARGS:=""} : ${OSH_EXTRA_HELM_ARGS:=""}
helm upgrade --install heat ./heat \ helm upgrade --install heat ./heat \
--namespace=openstack \ --namespace=openstack \
--set manifests.network_policy=true \
${OSH_EXTRA_HELM_ARGS} \ ${OSH_EXTRA_HELM_ARGS} \
${OSH_EXTRA_HELM_ARGS_HEAT} ${OSH_EXTRA_HELM_ARGS_HEAT}

1
tools/deployment/developer/common/100-horizon.sh
View File

@ -25,7 +25,6 @@ helm upgrade --install horizon ./horizon \
--namespace=openstack \ --namespace=openstack \
--set network.node_port.enabled=true \ --set network.node_port.enabled=true \
--set network.node_port.port=31000 \ --set network.node_port.port=31000 \
--set manifests.network_policy=true \
${OSH_EXTRA_HELM_ARGS} \ ${OSH_EXTRA_HELM_ARGS} \
${OSH_EXTRA_HELM_ARGS_HORIZON} ${OSH_EXTRA_HELM_ARGS_HORIZON}

1
tools/deployment/developer/common/140-openvswitch.sh
View File

@ -23,7 +23,6 @@ make -C ${OSH_INFRA_PATH} openvswitch
: ${OSH_EXTRA_HELM_ARGS:=""} : ${OSH_EXTRA_HELM_ARGS:=""}
helm upgrade --install openvswitch ${OSH_INFRA_PATH}/openvswitch \ helm upgrade --install openvswitch ${OSH_INFRA_PATH}/openvswitch \
--namespace=openstack \ --namespace=openstack \
--set manifests.network_policy=true \
${OSH_EXTRA_HELM_ARGS} \ ${OSH_EXTRA_HELM_ARGS} \
${OSH_EXTRA_HELM_ARGS_OPENVSWITCH} ${OSH_EXTRA_HELM_ARGS_OPENVSWITCH}

1
tools/deployment/developer/nfs/120-glance.sh
View File

@ -45,7 +45,6 @@ fi
helm upgrade --install glance ./glance \ helm upgrade --install glance ./glance \
--namespace=openstack \ --namespace=openstack \
--values=/tmp/glance.yaml \ --values=/tmp/glance.yaml \
--set manifests.network_policy=true \
${OSH_EXTRA_HELM_ARGS} \ ${OSH_EXTRA_HELM_ARGS} \
${OSH_EXTRA_HELM_ARGS_GLANCE} ${OSH_EXTRA_HELM_ARGS_GLANCE}

11
tools/deployment/developer/nfs/150-libvirt.sh
View File

@ -19,22 +19,11 @@ set -xe
: ${OSH_INFRA_PATH:="../openstack-helm-infra"} : ${OSH_INFRA_PATH:="../openstack-helm-infra"}
make -C ${OSH_INFRA_PATH} libvirt make -C ${OSH_INFRA_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 ${OSH_INFRA_PATH}/libvirt \ helm upgrade --install libvirt ${OSH_INFRA_PATH}/libvirt \
--namespace=openstack \ --namespace=openstack \
--set conf.ceph.enabled=false \ --set conf.ceph.enabled=false \
--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}

3
tools/deployment/developer/nfs/160-compute-kit.sh
View File

@ -26,7 +26,6 @@ if [ "x$(systemd-detect-virt)" == "xnone" ]; then
helm upgrade --install nova ./nova \ helm upgrade --install nova ./nova \
--namespace=openstack \ --namespace=openstack \
--set conf.ceph.enabled=false \ --set conf.ceph.enabled=false \
--set manifests.network_policy=true \
${OSH_EXTRA_HELM_ARGS} \ ${OSH_EXTRA_HELM_ARGS} \
${OSH_EXTRA_HELM_ARGS_NOVA} ${OSH_EXTRA_HELM_ARGS_NOVA}
else else
@ -36,7 +35,6 @@ else
--set conf.ceph.enabled=false \ --set conf.ceph.enabled=false \
--set conf.nova.libvirt.virt_type=qemu \ --set conf.nova.libvirt.virt_type=qemu \
--set conf.nova.libvirt.cpu_mode=none \ --set conf.nova.libvirt.cpu_mode=none \
--set manifests.network_policy=true \
${OSH_EXTRA_HELM_ARGS} \ ${OSH_EXTRA_HELM_ARGS} \
${OSH_EXTRA_HELM_ARGS_NOVA} ${OSH_EXTRA_HELM_ARGS_NOVA}
fi fi
@ -69,7 +67,6 @@ EOF
helm upgrade --install neutron ./neutron \ helm upgrade --install neutron ./neutron \
--namespace=openstack \ --namespace=openstack \
--values=/tmp/neutron.yaml \ --values=/tmp/neutron.yaml \
--set manifests.network_policy=true \
${OSH_EXTRA_HELM_ARGS} \ ${OSH_EXTRA_HELM_ARGS} \
${OSH_EXTRA_HELM_ARGS_NEUTRON} ${OSH_EXTRA_HELM_ARGS_NEUTRON}