openstack/openstack-helm
Code Issues Proposed changes

Merge "Get resource_type of kubernetes cgroup"

Browse Source
This commit is contained in:
Zuul 2023-04-13 17:41:39 +00:00 committed by Gerrit Code Review
commit 8457810b19
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/deployment/multinode/130-libvirt.sh
View File

@ -27,9 +27,20 @@ fi
#NOTE: Lint and package chart #NOTE: Lint and package chart
make -C ${OSH_INFRA_PATH} libvirt make -C ${OSH_INFRA_PATH} libvirt
#NOTE: Get resource_type of kubernetes cgroup
KUBERNETES_CGROUP=$(sudo docker info | grep "Cgroup Driver" | awk -F': ' '{print $2}' | grep -q systemd && echo kubepods.slice || echo kubepods)
#NOTE: Deploy libvirt
tee /tmp/libvirt.yaml << EOF
conf:
kubernetes:
cgroup: ${KUBERNETES_CGROUP}
EOF
#NOTE: Deploy libvirt #NOTE: Deploy libvirt
helm upgrade --install libvirt ${OSH_INFRA_PATH}/libvirt \ helm upgrade --install libvirt ${OSH_INFRA_PATH}/libvirt \
--namespace=openstack \ --namespace=openstack \
--values=/tmp/libvirt.yaml \
--set conf.ceph.enabled=${CEPH_ENABLED} \ --set conf.ceph.enabled=${CEPH_ENABLED} \
${OSH_EXTRA_HELM_ARGS} \ ${OSH_EXTRA_HELM_ARGS} \
${OSH_EXTRA_HELM_ARGS_LIBVIRT} ${OSH_EXTRA_HELM_ARGS_LIBVIRT}