From 27872a8cad4e28788ab2879e31613fe9745f87f8 Mon Sep 17 00:00:00 2001 From: Duong Ha-Quang Date: Wed, 31 May 2017 08:44:00 +0700 Subject: [PATCH] Remove cpu_mode option in Nova configuration The nova code already detects and defaults the cpu_mode, so remove the value from defaults and template to let Nova do the right things. If a deploy wants to change this setting, they can then use the config override mechanism to do so. Change-Id: I930582092d2c9eefc57e54b8620a80da3c35ef37 Closes-bug: #1679707 --- defaults/main.yml | 1 - .../notes/remove_nova_cpu_mode_option-e9fcfc97aa13a29a.yaml | 6 ++++++ templates/nova.conf.j2 | 1 - 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/remove_nova_cpu_mode_option-e9fcfc97aa13a29a.yaml diff --git a/defaults/main.yml b/defaults/main.yml index 890e1a96..566b52bd 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -312,7 +312,6 @@ nova_external_ssl: false nova_secure_proxy_ssl_header: HTTP_X_FORWARDED_PROTO ## Nova global config -nova_cpu_mode: host-model nova_linuxnet_interface_driver: nova.network.linux_net.NeutronLinuxBridgeInterfaceDriver diff --git a/releasenotes/notes/remove_nova_cpu_mode_option-e9fcfc97aa13a29a.yaml b/releasenotes/notes/remove_nova_cpu_mode_option-e9fcfc97aa13a29a.yaml new file mode 100644 index 00000000..f6be9936 --- /dev/null +++ b/releasenotes/notes/remove_nova_cpu_mode_option-e9fcfc97aa13a29a.yaml @@ -0,0 +1,6 @@ +--- +deprecations: + - | + The ``nova_cpu_mode`` Ansible variable has been removed to allow + Nova to detect the default value automatically. Hard-coded values + can cause problems. diff --git a/templates/nova.conf.j2 b/templates/nova.conf.j2 index 6e4f727e..60a46daf 100644 --- a/templates/nova.conf.j2 +++ b/templates/nova.conf.j2 @@ -258,7 +258,6 @@ inject_partition = {{ nova_libvirt_inject_partition }} inject_password = {{ nova_libvirt_inject_password }} inject_key = {{ nova_libvirt_inject_key }} use_virtio_for_bridges = True -cpu_mode = {{ nova_cpu_mode }} virt_type = {{ nova_virt_type }} remove_unused_resized_minimum_age_seconds = {{ nova_remove_unused_resized_minimum_age_seconds }}