Merge "nova: Replace deprecated [libvirt] cpu_model"

Author: Zuul

lib/nova_plugins/hypervisor-libvirt

@@ -41,7 +41,7 @@ function configure_nova_hypervisor {
     iniset $NOVA_CONF libvirt virt_type "$LIBVIRT_TYPE"
     iniset $NOVA_CONF libvirt cpu_mode "$LIBVIRT_CPU_MODE"
     if [ "$LIBVIRT_CPU_MODE" == "custom" ] ; then
-        iniset $NOVA_CONF libvirt cpu_model "$LIBVIRT_CPU_MODEL"
+        iniset $NOVA_CONF libvirt cpu_models "$LIBVIRT_CPU_MODEL"
     fi
     # Do not enable USB tablet input devices to avoid QEMU CPU overhead.
     iniset $NOVA_CONF DEFAULT pointer_model "ps2mouse"
@@ -56,10 +56,10 @@ function configure_nova_hypervisor {
     # arm64-specific configuration
     if is_arch "aarch64"; then
         iniset $NOVA_CONF libvirt cpu_mode "host-passthrough"
-        # NOTE(mnaser): We cannot have `cpu_model` set if the `cpu_mode` is
+        # NOTE(mnaser): We cannot have `cpu_models` set if the `cpu_mode` is
         #               set to `host-passthrough`, or `nova-compute` refuses to
         #               start.
-        inidelete $NOVA_CONF libvirt cpu_model
+        inidelete $NOVA_CONF libvirt cpu_models
     fi
 
     if isset ENABLE_FILE_INJECTION; then