diff options
| author | Stephen Finucane <stephenfin@redhat.com> | 2020-08-31 14:28:58 +0100 |
|---|---|---|
| committer | Stephen Finucane <stephenfin@redhat.com> | 2020-09-02 16:55:12 +0100 |
| commit | 46b1ff4e8025435a86c8cbba1b3e0ca983715d7e (patch) | |
| tree | d45685cff9b2957a699650d6ef1cd1c0981d6ee9 /nova/virt/vmwareapi | |
| parent | 340ef02e0678af592992b2d14c26ad2abff6e115 (diff) | |
| download | nova-46b1ff4e8025435a86c8cbba1b3e0ca983715d7e.tar.gz | |
libvirt: Remove '[vnc] keymap', '[spice] keymap' options
These options were deprecated way back in Rocky due to buggy behavior
they introduced. We can remove them now.
Change-Id: I9266edfd4ea6315239c54ff8d91e37d197c760c0
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
Diffstat (limited to 'nova/virt/vmwareapi')
| -rw-r--r-- | nova/virt/vmwareapi/driver.py | 6 | ||||
| -rw-r--r-- | nova/virt/vmwareapi/vm_util.py | 5 |
2 files changed, 1 insertions, 10 deletions
diff --git a/nova/virt/vmwareapi/driver.py b/nova/virt/vmwareapi/driver.py index c25aebb95a..b413a9160c 100644 --- a/nova/virt/vmwareapi/driver.py +++ b/nova/virt/vmwareapi/driver.py @@ -110,12 +110,6 @@ class VMwareVCDriver(driver.ComputeDriver): raise Exception(_("Must specify host_ip, host_username and " "host_password to use vmwareapi.VMwareVCDriver")) - if CONF.vnc.keymap: - LOG.warning('The option "[vnc] keymap" has been deprecated in ' - 'favor of the VMWare-specific "[vmware] vnc_keymap" ' - 'option. Please update nova.conf to address this ' - 'change') - self._datastore_regex = None if CONF.vmware.datastore_regex: try: diff --git a/nova/virt/vmwareapi/vm_util.py b/nova/virt/vmwareapi/vm_util.py index fdd3d74dcd..fd295dcdfb 100644 --- a/nova/virt/vmwareapi/vm_util.py +++ b/nova/virt/vmwareapi/vm_util.py @@ -1039,10 +1039,7 @@ def get_vnc_config_spec(client_factory, port): opt_port.value = port opt_keymap = client_factory.create('ns0:OptionValue') opt_keymap.key = "RemoteDisplay.vnc.keyMap" - if CONF.vnc.keymap: - opt_keymap.value = CONF.vnc.keymap - else: - opt_keymap.value = CONF.vmware.vnc_keymap + opt_keymap.value = CONF.vmware.vnc_keymap extras = [opt_enabled, opt_port, opt_keymap] |