From 8ecc724788055de10b8ac3fa6da01c3628b1b176 Mon Sep 17 00:00:00 2001 From: Andrii Ostapenko Date: Thu, 19 Mar 2020 13:27:43 -0500 Subject: [PATCH] Reuse component compute-kit.sh in developer installation Change-Id: I18fa34d1ae59165c2b851946cf21112beac22958 --- .../component/compute-kit/compute-kit.sh | 11 ++- .../developer/ceph/160-compute-kit.sh | 76 ++----------------- .../developer/nfs/160-compute-kit.sh | 71 +---------------- 3 files changed, 17 insertions(+), 141 deletions(-) diff --git a/tools/deployment/component/compute-kit/compute-kit.sh b/tools/deployment/component/compute-kit/compute-kit.sh index 7ab2879f2b..38ae957987 100755 --- a/tools/deployment/component/compute-kit/compute-kit.sh +++ b/tools/deployment/component/compute-kit/compute-kit.sh @@ -13,6 +13,9 @@ # under the License. set -xe + : ${CEPH_ENABLED:=false} + : ${RUN_HELM_TESTS:="yes"} + #NOTE: Get the overrides to use for placement, should placement be deployed. case "${OPENSTACK_RELEASE}" in "newton") @@ -72,7 +75,7 @@ if [ "x$(systemd-detect-virt)" == "xnone" ]; then helm upgrade --install nova ./nova \ --namespace=openstack \ --set bootstrap.wait_for_computes.enabled=true \ - --set conf.ceph.enabled=false \ + --set conf.ceph.enabled=${CEPH_ENABLED} \ ${OSH_EXTRA_HELM_ARGS:=} \ ${OSH_EXTRA_HELM_ARGS_NOVA} else @@ -80,7 +83,7 @@ else helm upgrade --install nova ./nova \ --namespace=openstack \ --set bootstrap.wait_for_computes.enabled=true \ - --set conf.ceph.enabled=false \ + --set conf.ceph.enabled=${CEPH_ENABLED} \ --set conf.nova.libvirt.virt_type=qemu \ --set conf.nova.libvirt.cpu_mode=none \ ${OSH_EXTRA_HELM_ARGS:=} \ @@ -136,6 +139,10 @@ openstack compute service list openstack network agent list openstack hypervisor list +if [ "x${RUN_HELM_TESTS}" == "xno" ]; then + exit 0 +fi + # Delete the test pods if they still exist kubectl delete pods -l application=nova,release_group=nova,component=test --namespace=openstack --ignore-not-found kubectl delete pods -l application=neutron,release_group=neutron,component=test --namespace=openstack --ignore-not-found diff --git a/tools/deployment/developer/ceph/160-compute-kit.sh b/tools/deployment/developer/ceph/160-compute-kit.sh index 5ca902e9af..d25fb26857 100755 --- a/tools/deployment/developer/ceph/160-compute-kit.sh +++ b/tools/deployment/developer/ceph/160-compute-kit.sh @@ -13,74 +13,8 @@ # under the License. set -xe -#NOTE: Get the over-rides to use -: ${OSH_EXTRA_HELM_ARGS_NOVA:="$(./tools/deployment/common/get-values-overrides.sh nova)"} -: ${OSH_EXTRA_HELM_ARGS_NEUTRON:="$(./tools/deployment/common/get-values-overrides.sh neutron)"} - -#NOTE: Lint and package chart -make nova -make neutron - -#NOTE: Deploy nova -: ${OSH_EXTRA_HELM_ARGS:=""} -if [ "x$(systemd-detect-virt)" == "xnone" ]; then - echo 'OSH is not being deployed in virtualized environment' - helm upgrade --install nova ./nova \ - --namespace=openstack \ - --set manifests.network_policy=true \ - ${OSH_EXTRA_HELM_ARGS} \ - ${OSH_EXTRA_HELM_ARGS_NOVA} -else - echo 'OSH is being deployed in virtualized environment, using qemu for nova' - helm upgrade --install nova ./nova \ - --namespace=openstack \ - --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 - -#NOTE: Deploy neutron -tee /tmp/neutron.yaml << EOF -network: - interface: - tunnel: docker0 -conf: - neutron: - DEFAULT: - l3_ha: False - max_l3_agents_per_router: 1 - l3_ha_network_type: vxlan - dhcp_agents_per_network: 1 - plugins: - ml2_conf: - ml2_type_flat: - flat_networks: public - #NOTE(portdirect): for clarity we include options for all the neutron - # backends here. - openvswitch_agent: - agent: - tunnel_types: vxlan - ovs: - bridge_mappings: public:br-ex - linuxbridge_agent: - linux_bridge: - bridge_mappings: public:br-ex -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} - -#NOTE: Wait for deploy -./tools/deployment/common/wait-for-pods.sh openstack - -#NOTE: Validate Deployment info -export OS_CLOUD=openstack_helm -openstack service list -sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx -openstack compute service list -openstack network agent list +export RUN_HELM_TESTS="no" +export CEPH_ENABLED=true +export OSH_EXTRA_HELM_ARGS_NOVA="${OSH_EXTRA_HELM_ARGS} --set manifests.network_policy=true" +# Deploy nova and neutron charts +./tools/deployment/component/compute-kit/compute-kit.sh diff --git a/tools/deployment/developer/nfs/160-compute-kit.sh b/tools/deployment/developer/nfs/160-compute-kit.sh index 2113f30ef1..e63c1fbcf5 100755 --- a/tools/deployment/developer/nfs/160-compute-kit.sh +++ b/tools/deployment/developer/nfs/160-compute-kit.sh @@ -13,71 +13,6 @@ # under the License. set -xe -#NOTE: Get the over-rides to use -: ${OSH_EXTRA_HELM_ARGS_NOVA:="$(./tools/deployment/common/get-values-overrides.sh nova)"} -: ${OSH_EXTRA_HELM_ARGS_NEUTRON:="$(./tools/deployment/common/get-values-overrides.sh neutron)"} - -#NOTE: Lint and package chart -make nova -make neutron - -#NOTE: Deploy nova -: ${OSH_EXTRA_HELM_ARGS:=""} -if [ "x$(systemd-detect-virt)" == "xnone" ]; then - echo 'OSH is not being deployed in virtualized environment' - helm upgrade --install nova ./nova \ - --namespace=openstack \ - --set conf.ceph.enabled=false \ - ${OSH_EXTRA_HELM_ARGS} \ - ${OSH_EXTRA_HELM_ARGS_NOVA} -else - echo 'OSH is being deployed in virtualized environment, using qemu for nova' - helm upgrade --install nova ./nova \ - --namespace=openstack \ - --set conf.ceph.enabled=false \ - --set conf.nova.libvirt.virt_type=qemu \ - --set conf.nova.libvirt.cpu_mode=none \ - ${OSH_EXTRA_HELM_ARGS} \ - ${OSH_EXTRA_HELM_ARGS_NOVA} -fi - -#NOTE: Deploy neutron -tee /tmp/neutron.yaml << EOF -network: - interface: - tunnel: docker0 -conf: - neutron: - DEFAULT: - l3_ha: False - max_l3_agents_per_router: 1 - l3_ha_network_type: vxlan - dhcp_agents_per_network: 1 - plugins: - ml2_conf: - ml2_type_flat: - flat_networks: public - openvswitch_agent: - agent: - tunnel_types: vxlan - ovs: - bridge_mappings: public:br-ex - linuxbridge_agent: - linux_bridge: - bridge_mappings: public:br-ex -EOF -helm upgrade --install neutron ./neutron \ - --namespace=openstack \ - --values=/tmp/neutron.yaml \ - ${OSH_EXTRA_HELM_ARGS} \ - ${OSH_EXTRA_HELM_ARGS_NEUTRON} - -#NOTE: Wait for deploy -./tools/deployment/common/wait-for-pods.sh openstack - -#NOTE: Validate Deployment info -export OS_CLOUD=openstack_helm -openstack service list -sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx -openstack compute service list -openstack network agent list +export RUN_HELM_TESTS="no" +# Deploy nova and neutron charts +./tools/deployment/component/compute-kit/compute-kit.sh