From dc0ed0c156ce044cf7bb211afc57e559ec051dd8 Mon Sep 17 00:00:00 2001 From: Dustin Specker Date: Mon, 6 Jun 2022 15:57:22 -0500 Subject: [PATCH] change var name used for nova virt args in umbrella deployment Before, the script was using OSH_EXTRA_HELM_ARGS to configure virt_type and cpu_mode. This unfortunately overrode any passed in OSH_EXTRA_HELM_ARGS. Now, use OSH_EXTRA_HELM_VIRT_ARGS so users can still specify OSH_EXTRA_HELM_ARGS when using `openstack.sh`. Change-Id: I34019f2f751bd2e1bbbfdc0a17b99613e478369c --- tools/deployment/component/common/openstack.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/deployment/component/common/openstack.sh b/tools/deployment/component/common/openstack.sh index 5a816bde85..29ff21b4d7 100755 --- a/tools/deployment/component/common/openstack.sh +++ b/tools/deployment/component/common/openstack.sh @@ -76,7 +76,7 @@ make -C ${HELM_CHART_ROOT_PATH} . if [ "x$(systemd-detect-virt)" != "xnone" ]; then echo 'OSH is being deployed in virtualized environment, using qemu for nova' - OSH_EXTRA_HELM_ARGS=( "--set nova.conf.nova.libvirt.virt_type=qemu" \ + OSH_EXTRA_HELM_VIRT_ARGS=( "--set nova.conf.nova.libvirt.virt_type=qemu" \ "--set nova.conf.nova.libvirt.cpu_mode=none" ) fi echo "helm installing openstack..." @@ -92,6 +92,7 @@ helm upgrade --install $release openstack/ \ ${OSH_EXTRA_HELM_ARGS_NOVA} \ ${OSH_EXTRA_HELM_ARGS_PLACEMENT} \ ${OSH_EXTRA_HELM_ARGS_NEUTRON} \ + ${OSH_EXTRA_HELM_VIRT_ARGS} \ ${OSH_EXTRA_HELM_ARGS} \ --set nova.bootstrap.wait_for_computes.enabled=true \ --set libvirt.conf.ceph.enabled=${CEPH_ENABLED} \