From 6e81fa45790c8903848c0f7ff68cd762169fbe0d Mon Sep 17 00:00:00 2001
From: Matt Riedemann <mriedem@us.ibm.com>
Date: Fri, 17 Jun 2016 16:54:54 -0400
Subject: [PATCH] Re-deprecate use_usb_tablet config option

The option was originally deprecated in
73d5d1f4618aca3fc5fa9d7cac6ea39b5199a3ca but that was
lost in dda676c80b539e98507cb85a1ce5644f74b755ee.

Let's fix it so we can still save the window for removing
it in Ocata.

Change-Id: Ia3acd7160b6d0043f3d0503812cdafc6850a1323
Closes-Bug: #1593878
---
 nova/conf/libvirt.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nova/conf/libvirt.py b/nova/conf/libvirt.py
index b105e930576d..d4b77a170aed 100644
--- a/nova/conf/libvirt.py
+++ b/nova/conf/libvirt.py
@@ -63,7 +63,9 @@ libvirt_general_opts = [
                     '0 => not partitioned, >0 => partition number'),
     cfg.BoolOpt('use_usb_tablet',
                 default=True,
-                help='Sync virtual and real mouse cursors in Windows VMs'),
+                deprecated_for_removal=True,
+                help='(Deprecated, please see pointer_model) Sync virtual and '
+                     'real mouse cursors in Windows VMs'),
     cfg.StrOpt('live_migration_inbound_addr',
                help='Live migration target ip or hostname '
                     '(if this option is set to None, which is the default, '