openstack/openstack-manuals
Code Issues Proposed changes

Merge "[config-ref] fix URI option at config tables"

Browse Source
This commit is contained in:
Jenkins 2016-10-13 11:10:16 +00:00 committed by Gerrit Code Review
commit c738bced14
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/config-reference/source/tables/nova-neutron.rst
View File

@ -65,7 +65,7 @@
* - ``timeout`` = ``None``
- (Integer) Timeout value for http requests
* - ``url`` = ``http://127.0.0.1:9696``
- (Unknown) This option specifies the URL for connecting to Neutron.
- (URI) This option specifies the URL for connecting to Neutron.
Possible values:

4
doc/config-reference/source/tables/nova-vnc.rst
View File

@ -63,7 +63,7 @@
* A keyboard layout which is supported by the underlying hypervisor on this node. This is usually an 'IETF language tag' (for example 'en-us'). If you use QEMU as hypervisor, you should find the list of supported keyboard layouts at ``/usr/share/qemu/keymaps``.
* - ``novncproxy_base_url`` = ``http://127.0.0.1:6080/vnc_auto.html``
- (Unknown) Public address of noVNC VNC console proxy.
- (URI) Public address of noVNC VNC console proxy.
The VNC proxy is an OpenStack component that enables compute service users to access their instances through VNC clients. noVNC provides VNC support through a websocket-based client.
@ -107,7 +107,7 @@
This option sets the private address to which proxy clients, such as ``nova-xvpvncproxy``, should connect to.
* - ``xvpvncproxy_base_url`` = ``http://127.0.0.1:6081/console``
- (Unknown) Public URL address of XVP VNC console proxy.
- (URI) Public URL address of XVP VNC console proxy.
The VNC proxy is an OpenStack component that enables compute service users to access their instances through VNC clients. Xen provides the Xenserver VNC Proxy, or XVP, as an alternative to the websocket-based noVNC proxy used by Libvirt. In contrast to noVNC, XVP clients are Java-based.

2
doc/config-reference/source/tables/trove-api.rst
View File

@ -57,7 +57,7 @@
* - ``trove_api_workers`` = ``None``
- (Integer) Number of workers for the API service. The default will be the number of CPUs available.
* - ``trove_auth_url`` = ``http://0.0.0.0:5000/v2.0``
- (Unknown) Trove authentication URL.
- (URI) Trove authentication URL.
* - ``trove_conductor_workers`` = ``None``
- (Integer) Number of workers for the Conductor service. The default will be the number of CPUs available.
* - ``trove_security_group_name_prefix`` = ``SecGroup``

2
doc/config-reference/source/tables/trove-compute.rst
View File

@ -27,7 +27,7 @@
* - ``nova_compute_service_type`` = ``compute``
- (String) Service type to use when searching catalog.
* - ``nova_compute_url`` = ``None``
- (Unknown) URL without the tenant segment.
- (URI) URL without the tenant segment.
* - ``root_grant`` = ``ALL``
- (List) Permissions to grant to the 'root' user.
* - ``root_grant_option`` = ``True``

6
doc/config-reference/source/tables/trove-dns.rst
View File

@ -21,7 +21,7 @@
* - ``dns_account_id`` =
- (String) Tenant ID for DNSaaS.
* - ``dns_auth_url`` = ``http://0.0.0.0``
- (Unknown) Authentication URL for DNSaaS.
- (URI) Authentication URL for DNSaaS.
* - ``dns_domain_id`` =
- (String) Domain ID used for adding DNS entries.
* - ``dns_domain_name`` =
@ -29,13 +29,13 @@
* - ``dns_driver`` = ``trove.dns.driver.DnsDriver``
- (String) Driver for DNSaaS.
* - ``dns_endpoint_url`` = ``http://0.0.0.0``
- (Unknown) Endpoint URL for DNSaaS.
- (URI) Endpoint URL for DNSaaS.
* - ``dns_hostname`` = ``localhost``
- (Unknown) Hostname used for adding DNS entries.
* - ``dns_instance_entry_factory`` = ``trove.dns.driver.DnsInstanceEntryFactory``
- (String) Factory for adding DNS entries.
* - ``dns_management_base_url`` = ``http://0.0.0.0``
- (Unknown) Management URL for DNSaaS.
- (URL) Management URL for DNSaaS.
* - ``dns_passkey`` =
- (String) Passkey for DNSaaS.
* - ``dns_region`` =

2
doc/config-reference/source/tables/trove-heat.rst
View File

@ -25,4 +25,4 @@
* - ``heat_time_out`` = ``60``
- (Integer) Maximum time (in seconds) to wait for a Heat request to complete.
* - ``heat_url`` = ``None``
- (Unknown) URL without the tenant segment.
- (URI) URL without the tenant segment.

2
doc/config-reference/source/tables/trove-swift.rst
View File

@ -23,4 +23,4 @@
* - ``swift_service_type`` = ``object-store``
- (String) Service type to use when searching catalog.
* - ``swift_url`` = ``None``
- (Unknown) URL ending in ``AUTH_``.
- (URI) URL ending in ``AUTH_``.

2
doc/config-reference/source/tables/trove-volume.rst
View File

@ -25,7 +25,7 @@
* - ``cinder_service_type`` = ``volumev2``
- (String) Service type to use when searching catalog.
* - ``cinder_url`` = ``None``
- (Unknown) URL without the tenant segment.
- (URI) URL without the tenant segment.
* - ``cinder_volume_type`` = ``None``
- (String) Volume type to use when provisioning a Cinder volume.
* - ``device_path`` = ``/dev/vdb``