Add common config options for SPICE graphics

The VNC config options are shared across hypervisor drivers, and
while SPICE originally only supported KVM, it is now possible to
use it with Xen too. Thus, adding common SPICE config options
makes more sense than adding them to the libvirt driver only

DocImpact
Blueprint: libvirt-spice
Change-Id: I8e817530908c6fee0781b92dc9e27010951b4540
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

2 files changed, 76 insertions, 1 deletions

diff --git a/etc/nova/nova.conf.sample b/etc/nova/nova.conf.sample
index 77133d988..96118eb76 100644
--- a/etc/nova/nova.conf.sample
+++ b/etc/nova/nova.conf.sample
@@ -2518,4 +2518,32 @@
 #attestation_auth_blob=<None>
 
 
-# Total option count: 514
+[spice]
+
+#
+# Options defined in nova.spice
+#
+
+# location of spice html5 console proxy, in the form
+# "http://127.0.0.1:6080/spice_auto.html" (string value)
+#html5proxy_base_url=http://127.0.0.1:6080/spice_auto.html
+
+# IP address on which instance spice server should listen
+# (string value)
+#server_listen=127.0.0.1
+
+# the address to which proxy clients (like nova-
+# spicehtml5proxy) should connect (string value)
+#server_proxyclient_address=127.0.0.1
+
+# enable spice related features (boolean value)
+#enabled=false
+
+# enable spice guest agent support (boolean value)
+#agent_enabled=true
+
+# keymap for spice (string value)
+#keymap=en-us
+
+
+# Total option count: 519
diff --git a/nova/spice/__init__.py b/nova/spice/__init__.py
new file mode 100644
index 000000000..390957e27
--- /dev/null
+++ b/nova/spice/__init__.py
@@ -0,0 +1,47 @@
+#!/usr/bin/env python
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright (c) 2012 Red Hat, Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+"""Module for SPICE Proxying."""
+
+from nova.openstack.common import cfg
+
+
+spice_opts = [
+    cfg.StrOpt('html5proxy_base_url',
+               default='http://127.0.0.1:6080/spice_auto.html',
+               help='location of spice html5 console proxy, in the form '
+                    '"http://127.0.0.1:6080/spice_auto.html"'),
+    cfg.StrOpt('server_listen',
+               default='127.0.0.1',
+               help='IP address on which instance spice server should listen'),
+    cfg.StrOpt('server_proxyclient_address',
+               default='127.0.0.1',
+               help='the address to which proxy clients '
+                    '(like nova-spicehtml5proxy) should connect'),
+    cfg.BoolOpt('enabled',
+                default=False,
+                help='enable spice related features'),
+    cfg.BoolOpt('agent_enabled',
+                default=True,
+                help='enable spice guest agent support'),
+    cfg.StrOpt('keymap',
+               default='en-us',
+               help='keymap for spice'),
+    ]
+
+CONF = cfg.CONF
+CONF.register_opts(spice_opts, group='spice')