summaryrefslogtreecommitdiffstats
path: root/doc/source
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-01-17 11:59:25 +0000
committerGerrit Code Review <review@openstack.org>2013-01-17 11:59:25 +0000
commitb76c5cfc8eca20ee55d3f47b103140d1cbd372cd (patch)
treeedff555fb550c7248e507ba9b3f95c0819c9e7d0 /doc/source
parentbd8399bd2f51f1dcaa5194cb035415c634383917 (diff)
parenteab051ec68bdc8792dddb63c9231ece11ab06037 (diff)
downloadnova-b76c5cfc8eca20ee55d3f47b103140d1cbd372cd.tar.gz
nova-b76c5cfc8eca20ee55d3f47b103140d1cbd372cd.tar.xz
nova-b76c5cfc8eca20ee55d3f47b103140d1cbd372cd.zip
Merge "Add nova-spicehtml5proxy helper"
Diffstat (limited to 'doc/source')
-rw-r--r--doc/source/conf.py2
-rw-r--r--doc/source/man/nova-spicehtml5proxy.rst48
2 files changed, 50 insertions, 0 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 804080e79..0bdaeb08e 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -145,6 +145,8 @@ man_pages = [
[u'OpenStack'], 1),
('man/nova-novncproxy', 'nova-novncproxy', u'Cloud controller fabric',
[u'OpenStack'], 1),
+ ('man/nova-spicehtml5proxy', 'nova-spicehtml5proxy', u'Cloud controller fabric',
+ [u'OpenStack'], 1),
('man/nova-objectstore', 'nova-objectstore', u'Cloud controller fabric',
[u'OpenStack'], 1),
('man/nova-rootwrap', 'nova-rootwrap', u'Cloud controller fabric',
diff --git a/doc/source/man/nova-spicehtml5proxy.rst b/doc/source/man/nova-spicehtml5proxy.rst
new file mode 100644
index 000000000..4d0aaa202
--- /dev/null
+++ b/doc/source/man/nova-spicehtml5proxy.rst
@@ -0,0 +1,48 @@
+====================
+nova-spicehtml5proxy
+====================
+
+--------------------------------------------------------
+Websocket Proxy for OpenStack Nova SPICE HTML5 consoles.
+--------------------------------------------------------
+
+:Author: openstack@lists.launchpad.net
+:Date: 2012-09-27
+:Copyright: OpenStack LLC
+:Version: 2012.1
+:Manual section: 1
+:Manual group: cloud computing
+
+SYNOPSIS
+========
+
+ nova-spicehtml5proxy [options]
+
+DESCRIPTION
+===========
+
+Websocket proxy that is compatible with OpenStack Nova
+SPICE HTML5 consoles.
+
+OPTIONS
+=======
+
+ **General options**
+
+FILES
+========
+
+* /etc/nova/nova.conf
+* /etc/nova/policy.json
+* /etc/nova/rootwrap.conf
+* /etc/nova/rootwrap.d/
+
+SEE ALSO
+========
+
+* `OpenStack Nova <http://nova.openstack.org>`__
+
+BUGS
+====
+
+* Nova is sourced in Launchpad so you can view current bugs at `OpenStack Nova <http://nova.openstack.org>`__