From a71608851d3b64bb33d946da677b3e3b013520f5 Mon Sep 17 00:00:00 2001 From: KATO Tomoyuki Date: Thu, 13 Oct 2016 19:56:03 +0900 Subject: [PATCH] [config-ref] fix URI option at config tables Change-Id: Ia041e4c91f273a00afcd6aac68220f98d8c1df4a --- doc/config-reference/source/tables/nova-neutron.rst | 2 +- doc/config-reference/source/tables/nova-vnc.rst | 4 ++-- doc/config-reference/source/tables/trove-api.rst | 2 +- doc/config-reference/source/tables/trove-compute.rst | 2 +- doc/config-reference/source/tables/trove-dns.rst | 6 +++--- doc/config-reference/source/tables/trove-heat.rst | 2 +- doc/config-reference/source/tables/trove-swift.rst | 2 +- doc/config-reference/source/tables/trove-volume.rst | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/config-reference/source/tables/nova-neutron.rst b/doc/config-reference/source/tables/nova-neutron.rst index 5ea93eecf3..d2b0fd94a1 100644 --- a/doc/config-reference/source/tables/nova-neutron.rst +++ b/doc/config-reference/source/tables/nova-neutron.rst @@ -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: diff --git a/doc/config-reference/source/tables/nova-vnc.rst b/doc/config-reference/source/tables/nova-vnc.rst index 4ebd7adb0e..2e06247cf6 100644 --- a/doc/config-reference/source/tables/nova-vnc.rst +++ b/doc/config-reference/source/tables/nova-vnc.rst @@ -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. diff --git a/doc/config-reference/source/tables/trove-api.rst b/doc/config-reference/source/tables/trove-api.rst index ab068cfdd0..1d1d5913bf 100644 --- a/doc/config-reference/source/tables/trove-api.rst +++ b/doc/config-reference/source/tables/trove-api.rst @@ -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`` diff --git a/doc/config-reference/source/tables/trove-compute.rst b/doc/config-reference/source/tables/trove-compute.rst index 2f1b222348..92489e2662 100644 --- a/doc/config-reference/source/tables/trove-compute.rst +++ b/doc/config-reference/source/tables/trove-compute.rst @@ -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`` diff --git a/doc/config-reference/source/tables/trove-dns.rst b/doc/config-reference/source/tables/trove-dns.rst index db3bd5705e..a35b839e88 100644 --- a/doc/config-reference/source/tables/trove-dns.rst +++ b/doc/config-reference/source/tables/trove-dns.rst @@ -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`` = diff --git a/doc/config-reference/source/tables/trove-heat.rst b/doc/config-reference/source/tables/trove-heat.rst index ec449632c4..52a686c7ea 100644 --- a/doc/config-reference/source/tables/trove-heat.rst +++ b/doc/config-reference/source/tables/trove-heat.rst @@ -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. diff --git a/doc/config-reference/source/tables/trove-swift.rst b/doc/config-reference/source/tables/trove-swift.rst index c14ba6a2e8..25a9724658 100644 --- a/doc/config-reference/source/tables/trove-swift.rst +++ b/doc/config-reference/source/tables/trove-swift.rst @@ -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_``. diff --git a/doc/config-reference/source/tables/trove-volume.rst b/doc/config-reference/source/tables/trove-volume.rst index 9cd14224b0..3e670bb3a8 100644 --- a/doc/config-reference/source/tables/trove-volume.rst +++ b/doc/config-reference/source/tables/trove-volume.rst @@ -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``