Add cpu_mode in nova.conf

With libvirt 2.0, when using qemu cpu mode is not properly
evaluated and need to be set to cpu_mode = none.

Add this option when kvm is not supported, otherwise user
will still facing errors when launching instances over qemu.

Change-Id: Ib00fa257fb33fd3281f484a47a945640da8dda56
This commit is contained in:
caoyuan 2018-06-21 17:22:50 +08:00
parent cc30691207
commit 27e18daea7
6 changed files with 6 additions and 0 deletions

View File

@ -171,6 +171,7 @@ all the ``--set`` flags
helm install --name=nova local/nova --namespace=openstack \
--values=./tools/overrides/mvp/nova.yaml \
--set conf.nova.libvirt.virt_type=qemu \
--set conf.nova.libvirt.cpu_mode=none \
--set endpoints.compute.host_fqdn_override.public=nova.$FQDN \
--set endpoints.compute_metadata.host_fqdn_override.public=metadata.$FQDN \
--set endpoints.image.host_fqdn_override.public=glance.$FQDN \

View File

@ -931,6 +931,7 @@ data:
nova:
libvirt:
virt_type: qemu
cpu_mode: none
source:
type: local
location: ${OSH_PATH}

View File

@ -32,6 +32,7 @@ else
helm upgrade --install nova ./nova \
--namespace=openstack \
--set conf.nova.libvirt.virt_type=qemu \
--set conf.nova.libvirt.cpu_mode=none \
${OSH_EXTRA_HELM_ARGS} \
${OSH_EXTRA_HELM_ARGS_NOVA}
fi

View File

@ -34,6 +34,7 @@ else
--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

View File

@ -44,6 +44,7 @@ else
--namespace=openstack \
--values=/tmp/nova.yaml \
--set conf.nova.libvirt.virt_type=qemu \
--set conf.nova.libvirt.cpu_mode=none \
${OSH_EXTRA_HELM_ARGS} \
${OSH_EXTRA_HELM_ARGS_NOVA}
fi

View File

@ -61,6 +61,7 @@ else
helm upgrade --install nova ./nova \
--namespace=openstack \
--set conf.nova.libvirt.virt_type=qemu \
--set conf.nova.libvirt.cpu_mode=none \
--values /tmp/nova.yaml \
${OSH_EXTRA_HELM_ARGS}
fi