openstack/openstack-helm
Code Issues Proposed changes

Merge "Set libvirt cgroup path to openstack-helm/ if hugepages is enabled on system"

Browse Source
This commit is contained in:
Zuul 2022-06-27 19:16:03 +00:00 committed by Gerrit Code Review
commit db4ade3f72
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,6 +79,13 @@ if [ "x$(systemd-detect-virt)" != "xnone" ]; then
OSH_EXTRA_HELM_VIRT_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
# Check if Hugepages is enabled
hgpgs_available="$(awk '/HugePages_Total/{print $2}' /proc/meminfo)"
if [ "x$hgpgs_available" != "x0" ]; then
OSH_EXTRA_HELM_ARGS_LIBVIRT_CGROUP="--set libvirt.conf.kubernetes.cgroup=."
fi
echo "helm installing openstack..." echo "helm installing openstack..."
helm upgrade --install $release openstack/ \ helm upgrade --install $release openstack/ \
${OSH_EXTRA_HELM_ARGS_MARIADB} \ ${OSH_EXTRA_HELM_ARGS_MARIADB} \
@ -92,6 +99,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_ARGS_LIBVIRT_CGROUP} \
${OSH_EXTRA_HELM_VIRT_ARGS} \ ${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 \