openstack/openstack-helm
Code Issues Proposed changes

change var name used for nova virt args in umbrella deployment

Browse Source 
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
This commit is contained in:
Dustin Specker 2022-06-06 15:57:22 -05:00
parent 2e1acad694
commit dc0ed0c156
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/deployment/component/common/openstack.sh
View File

@ -76,7 +76,7 @@ make -C ${HELM_CHART_ROOT_PATH} .
if [ "x$(systemd-detect-virt)" != "xnone" ]; then if [ "x$(systemd-detect-virt)" != "xnone" ]; then
echo 'OSH is being deployed in virtualized environment, using qemu for nova' 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" ) "--set nova.conf.nova.libvirt.cpu_mode=none" )
fi fi
echo "helm installing openstack..." echo "helm installing openstack..."
@ -92,6 +92,7 @@ helm upgrade --install $release openstack/ \
${OSH_EXTRA_HELM_ARGS_NOVA} \ ${OSH_EXTRA_HELM_ARGS_NOVA} \
${OSH_EXTRA_HELM_ARGS_PLACEMENT} \ ${OSH_EXTRA_HELM_ARGS_PLACEMENT} \
${OSH_EXTRA_HELM_ARGS_NEUTRON} \ ${OSH_EXTRA_HELM_ARGS_NEUTRON} \
${OSH_EXTRA_HELM_VIRT_ARGS} \
${OSH_EXTRA_HELM_ARGS} \ ${OSH_EXTRA_HELM_ARGS} \
--set nova.bootstrap.wait_for_computes.enabled=true \ --set nova.bootstrap.wait_for_computes.enabled=true \
--set libvirt.conf.ceph.enabled=${CEPH_ENABLED} \ --set libvirt.conf.ceph.enabled=${CEPH_ENABLED} \