diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-03-07 01:07:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-03-07 01:07:53 +0000 |
| commit | f3559e1ac4f4fa20d8af46d00cee622c6c1faf0f (patch) | |
| tree | c45745f64b48fde9fcf6762396e3d152f2a9ff27 /doc | |
| parent | 314dd69ab00cb35b0683a384023e0cae9844428b (diff) | |
| parent | bac357663c89ac14d41719b53b9a64612ac80d99 (diff) | |
| download | nova-f3559e1ac4f4fa20d8af46d00cee622c6c1faf0f.tar.gz | |
Merge "Fix references to novncproxy_base_url in docs."
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/source/runnova/vncconsole.rst | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/doc/source/runnova/vncconsole.rst b/doc/source/runnova/vncconsole.rst index f851e5372b..d6bc163228 100644 --- a/doc/source/runnova/vncconsole.rst +++ b/doc/source/runnova/vncconsole.rst @@ -48,6 +48,9 @@ nova-consoleauth. This service must be running in order for for either proxy to work. Many proxies of either type can be run against a single nova-consoleauth service in a cluster configuration. +nova-consoleauth should not be confused with nova-console, which is a xen-specific +service that is not used by the most recent vnc proxy architecture. + Getting an Access Url --------------------- Nova provides the ability to create access_urls through the os-consoles extension. @@ -63,7 +66,7 @@ Accessing VNC Consoles with a Java client To enable support for the OpenStack java vnc client in nova, nova provides the nova-xvpvncproxy service, which you should run to enable this feature. -* :option:`--xvpvncproxy_baseurl=[base url for client connections]` - +* :option:`--xvpvncproxy_base_url=[base url for client connections]` - this is the public base url to which clients will connect. "?token=abc" will be added to this url for the purposes of auth. * :option:`--xvpvncproxy_port=[port]` - port to bind (defaults to 6081) @@ -109,7 +112,7 @@ server address and credentials. By default, nova-novncproxy binds 0.0.0.0:6080. This can be configured with: -* :option:`--novncproxy_baseurl=[base url for client connections]` - +* :option:`--novncproxy_base_url=[base url for client connections]` - this is the public base url to which clients will connect. "?token=abc" will be added to this url for the purposes of auth. * :option:`--novncproxy_port=[port]` |