From 14908866c88cbf6438e7edc061d151745ff180a7 Mon Sep 17 00:00:00 2001 From: Shaun McCance <shaunm@gnome.org> Date: Sun, 19 Jan 2014 17:26:08 -0500 Subject: [PATCH] Add group information to nova config reference Change-Id: I8f25f33e031fb28f26a773a79e99e719e671bc7e --- doc/common/tables/nova-api.xml | 6 ++++++ doc/common/tables/nova-apiv3.xml | 3 +++ doc/common/tables/nova-authentication.xml | 3 +++ doc/common/tables/nova-availabilityzones.xml | 3 +++ doc/common/tables/nova-baremetal.xml | 6 ++++++ doc/common/tables/nova-ca.xml | 6 ++++++ doc/common/tables/nova-cells.xml | 3 +++ doc/common/tables/nova-common.xml | 3 +++ doc/common/tables/nova-compute.xml | 3 +++ doc/common/tables/nova-conductor.xml | 6 ++++++ doc/common/tables/nova-configdrive.xml | 6 ++++++ doc/common/tables/nova-console.xml | 3 +++ doc/common/tables/nova-db.xml | 9 +++++++++ doc/common/tables/nova-docker.xml | 3 +++ doc/common/tables/nova-ec2.xml | 3 +++ doc/common/tables/nova-fping.xml | 3 +++ doc/common/tables/nova-glance.xml | 6 ++++++ doc/common/tables/nova-hyperv.xml | 3 +++ doc/common/tables/nova-hypervisor.xml | 6 ++++++ doc/common/tables/nova-ipv6.xml | 3 +++ doc/common/tables/nova-keymgr.xml | 3 +++ doc/common/tables/nova-kombu.xml | 3 +++ doc/common/tables/nova-ldap.xml | 3 +++ doc/common/tables/nova-libvirt.xml | 6 ++++++ doc/common/tables/nova-livemigration.xml | 6 ++++++ doc/common/tables/nova-logging.xml | 3 +++ doc/common/tables/nova-metadata.xml | 3 +++ doc/common/tables/nova-network.xml | 6 ++++++ doc/common/tables/nova-neutron.xml | 3 +++ doc/common/tables/nova-pci.xml | 3 +++ doc/common/tables/nova-periodic.xml | 3 +++ doc/common/tables/nova-policy.xml | 3 +++ doc/common/tables/nova-qpid.xml | 3 +++ doc/common/tables/nova-quota.xml | 6 ++++++ doc/common/tables/nova-rabbitmq.xml | 3 +++ doc/common/tables/nova-redis.xml | 6 ++++++ doc/common/tables/nova-rpc.xml | 15 +++++++++++++++ doc/common/tables/nova-s3.xml | 3 +++ doc/common/tables/nova-scheduling.xml | 9 +++++++++ doc/common/tables/nova-spice.xml | 3 +++ doc/common/tables/nova-testing.xml | 3 +++ doc/common/tables/nova-tilera.xml | 3 +++ doc/common/tables/nova-trustedcomputing.xml | 3 +++ doc/common/tables/nova-upgrade_levels.xml | 6 ++++++ doc/common/tables/nova-vmware.xml | 3 +++ doc/common/tables/nova-vnc.xml | 6 ++++++ doc/common/tables/nova-volumes.xml | 15 +++++++++++++++ doc/common/tables/nova-vpn.xml | 3 +++ doc/common/tables/nova-wsgi.xml | 3 +++ doc/common/tables/nova-xen.xml | 9 +++++++++ doc/common/tables/nova-xvpnvncproxy.xml | 3 +++ doc/common/tables/nova-zeromq.xml | 3 +++ doc/common/tables/nova-zookeeper.xml | 3 +++ 53 files changed, 243 insertions(+) diff --git a/doc/common/tables/nova-api.xml b/doc/common/tables/nova-api.xml index 87a6c4b3a3..5e2f54f8d8 100644 --- a/doc/common/tables/nova-api.xml +++ b/doc/common/tables/nova-api.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[DEFAULT]</th> + </tr> <tr> <td>enable_new_services = True</td> <td>(BoolOpt) Services to be added to the available pool on create</td> @@ -83,6 +86,9 @@ <td>use_forwarded_for = False</td> <td>(BoolOpt) Treat X-Forwarded-For as the canonical remote address. Only enable this if you have a sanitizing proxy.</td> </tr> + <tr> + <th colspan="2">[database]</th> + </tr> <tr> <td>use_tpool = False</td> <td>(BoolOpt) Enable the experimental use of thread pooling for all DB API calls</td> diff --git a/doc/common/tables/nova-apiv3.xml b/doc/common/tables/nova-apiv3.xml index b085a44449..8304bf6fbc 100644 --- a/doc/common/tables/nova-apiv3.xml +++ b/doc/common/tables/nova-apiv3.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[osapi_v3]</th> + </tr> <tr> <td>enabled = False</td> <td>(BoolOpt) Whether the V3 API is enabled or not</td> diff --git a/doc/common/tables/nova-authentication.xml b/doc/common/tables/nova-authentication.xml index 93d673d009..ae6421817e 100644 --- a/doc/common/tables/nova-authentication.xml +++ b/doc/common/tables/nova-authentication.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[DEFAULT]</th> + </tr> <tr> <td>api_rate_limit = False</td> <td>(BoolOpt) whether to use per-user rate limiting for the api. This option is only used by v2 api. rate limiting is removed from v3 api.</td> diff --git a/doc/common/tables/nova-availabilityzones.xml b/doc/common/tables/nova-availabilityzones.xml index c68f252032..c37428898c 100644 --- a/doc/common/tables/nova-availabilityzones.xml +++ b/doc/common/tables/nova-availabilityzones.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[DEFAULT]</th> + </tr> <tr> <td>default_availability_zone = nova</td> <td>(StrOpt) default compute node availability_zone</td> diff --git a/doc/common/tables/nova-baremetal.xml b/doc/common/tables/nova-baremetal.xml index aa572d0a1d..3a88f86244 100644 --- a/doc/common/tables/nova-baremetal.xml +++ b/doc/common/tables/nova-baremetal.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[baremetal]</th> + </tr> <tr> <td>db_backend = sqlalchemy</td> <td>(StrOpt) The backend to use for bare-metal database</td> @@ -123,6 +126,9 @@ <td>virtual_power_type = virsh</td> <td>(StrOpt) base command to use for virtual power(vbox,virsh)</td> </tr> + <tr> + <th colspan="2">[xenserver]</th> + </tr> <tr> <td>vif_driver = nova.virt.xenapi.vif.XenAPIBridgeDriver</td> <td>(StrOpt) The XenAPI VIF driver using XenServer Network APIs.</td> diff --git a/doc/common/tables/nova-ca.xml b/doc/common/tables/nova-ca.xml index f25b45f7f2..0b41201935 100644 --- a/doc/common/tables/nova-ca.xml +++ b/doc/common/tables/nova-ca.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[DEFAULT]</th> + </tr> <tr> <td>ca_file = cacert.pem</td> <td>(StrOpt) Filename of root CA</td> @@ -55,6 +58,9 @@ <td>user_cert_subject = /C=US/ST=California/O=OpenStack/OU=NovaDev/CN=%.16s-%.16s-%s</td> <td>(StrOpt) Subject for certificate for users, %s for project, user, timestamp</td> </tr> + <tr> + <th colspan="2">[ssl]</th> + </tr> <tr> <td>ca_file = None</td> <td>(StrOpt) CA certificate file to use to verify connecting clients</td> diff --git a/doc/common/tables/nova-cells.xml b/doc/common/tables/nova-cells.xml index 4014a38f50..602246e651 100644 --- a/doc/common/tables/nova-cells.xml +++ b/doc/common/tables/nova-cells.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[cells]</th> + </tr> <tr> <td>call_timeout = 60</td> <td>(IntOpt) Seconds to wait for response from a call to a cell.</td> diff --git a/doc/common/tables/nova-common.xml b/doc/common/tables/nova-common.xml index fc02482351..9664d71336 100644 --- a/doc/common/tables/nova-common.xml +++ b/doc/common/tables/nova-common.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[DEFAULT]</th> + </tr> <tr> <td>bindir = /usr/local/bin</td> <td>(StrOpt) Directory where nova binaries are installed</td> diff --git a/doc/common/tables/nova-compute.xml b/doc/common/tables/nova-compute.xml index 3e161e84ac..11b8da7b24 100644 --- a/doc/common/tables/nova-compute.xml +++ b/doc/common/tables/nova-compute.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[DEFAULT]</th> + </tr> <tr> <td>compute_available_monitors = ['nova.compute.monitors.all_monitors']</td> <td>(MultiStrOpt) Monitor classes available to the compute which may be specified more than once.</td> diff --git a/doc/common/tables/nova-conductor.xml b/doc/common/tables/nova-conductor.xml index adb285d80e..3125302450 100644 --- a/doc/common/tables/nova-conductor.xml +++ b/doc/common/tables/nova-conductor.xml @@ -15,10 +15,16 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[DEFAULT]</th> + </tr> <tr> <td>migrate_max_retries = -1</td> <td>(IntOpt) Number of times to retry live-migration before failing. If == -1, try until out of hosts. If == 0, only try once, no retries.</td> </tr> + <tr> + <th colspan="2">[conductor]</th> + </tr> <tr> <td>manager = nova.conductor.manager.ConductorManager</td> <td>(StrOpt) full class name for the Manager for conductor</td> diff --git a/doc/common/tables/nova-configdrive.xml b/doc/common/tables/nova-configdrive.xml index 7244ddf51b..a323447002 100644 --- a/doc/common/tables/nova-configdrive.xml +++ b/doc/common/tables/nova-configdrive.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[DEFAULT]</th> + </tr> <tr> <td>config_drive_format = iso9660</td> <td>(StrOpt) Config drive format. One of iso9660 (default) or vfat</td> @@ -35,6 +38,9 @@ <td>mkisofs_cmd = genisoimage</td> <td>(StrOpt) Name and optionally path of the tool used for ISO image creation</td> </tr> + <tr> + <th colspan="2">[hyperv]</th> + </tr> <tr> <td>config_drive_cdrom = False</td> <td>(BoolOpt) Attaches the Config Drive image as a cdrom drive instead of a disk drive</td> diff --git a/doc/common/tables/nova-console.xml b/doc/common/tables/nova-console.xml index 6a3d6ab035..a9317b8a85 100644 --- a/doc/common/tables/nova-console.xml +++ b/doc/common/tables/nova-console.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[DEFAULT]</th> + </tr> <tr> <td>console_public_hostname = oslo</td> <td>(StrOpt) Publicly visible name for this console host</td> diff --git a/doc/common/tables/nova-db.xml b/doc/common/tables/nova-db.xml index 4869a739cd..a9e3932abf 100644 --- a/doc/common/tables/nova-db.xml +++ b/doc/common/tables/nova-db.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[DEFAULT]</th> + </tr> <tr> <td>db_driver = nova.db</td> <td>(StrOpt) driver to use for database access</td> @@ -27,10 +30,16 @@ <td>sqlite_synchronous = True</td> <td>(BoolOpt) If true, use synchronous mode for sqlite</td> </tr> + <tr> + <th colspan="2">[cells]</th> + </tr> <tr> <td>db_check_interval = 60</td> <td>(IntOpt) Seconds between getting fresh cell info from db.</td> </tr> + <tr> + <th colspan="2">[database]</th> + </tr> <tr> <td>backend = sqlalchemy</td> <td>(StrOpt) The backend to use for db</td> diff --git a/doc/common/tables/nova-docker.xml b/doc/common/tables/nova-docker.xml index 9a461a082f..61a53bdc15 100644 --- a/doc/common/tables/nova-docker.xml +++ b/doc/common/tables/nova-docker.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[docker]</th> + </tr> <tr> <td>registry_default_port = 5042</td> <td>(IntOpt) Default TCP port to find the docker-registry container</td> diff --git a/doc/common/tables/nova-ec2.xml b/doc/common/tables/nova-ec2.xml index b19bdebd19..0363716854 100644 --- a/doc/common/tables/nova-ec2.xml +++ b/doc/common/tables/nova-ec2.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[DEFAULT]</th> + </tr> <tr> <td>ec2_dmz_host = $my_ip</td> <td>(StrOpt) the internal ip of the ec2 api server</td> diff --git a/doc/common/tables/nova-fping.xml b/doc/common/tables/nova-fping.xml index ef22685921..7c647eb5c7 100644 --- a/doc/common/tables/nova-fping.xml +++ b/doc/common/tables/nova-fping.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[DEFAULT]</th> + </tr> <tr> <td>fping_path = /usr/sbin/fping</td> <td>(StrOpt) Full path to fping.</td> diff --git a/doc/common/tables/nova-glance.xml b/doc/common/tables/nova-glance.xml index 35a01355e5..c781c4b7f3 100644 --- a/doc/common/tables/nova-glance.xml +++ b/doc/common/tables/nova-glance.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[DEFAULT]</th> + </tr> <tr> <td>allowed_direct_url_schemes = </td> <td>(ListOpt) A list of url scheme that can be downloaded directly via the direct_url. Currently supported schemes: [file].</td> @@ -47,6 +50,9 @@ <td>osapi_glance_link_prefix = None</td> <td>(StrOpt) Base URL that will be presented to users in links to glance resources</td> </tr> + <tr> + <th colspan="2">[image_file_url]</th> + </tr> <tr> <td>filesystems = </td> <td>(ListOpt) A list of filesystems that will be configured in this file under the sections image_file_url:<list entry name></td> diff --git a/doc/common/tables/nova-hyperv.xml b/doc/common/tables/nova-hyperv.xml index b4fb602c5b..8e9f0a6d80 100644 --- a/doc/common/tables/nova-hyperv.xml +++ b/doc/common/tables/nova-hyperv.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[hyperv]</th> + </tr> <tr> <td>dynamic_memory_ratio = 1.0</td> <td>(FloatOpt) Enables dynamic memory allocation (ballooning) when set to a value greater than 1. The value expresses the ratio between the total RAM assigned to an instance and its startup RAM amount. For example a ratio of 2.0 for an instance with 1024MB of RAM implies 512MB of RAM allocated at startup</td> diff --git a/doc/common/tables/nova-hypervisor.xml b/doc/common/tables/nova-hypervisor.xml index b8630bff28..2611f6c54e 100644 --- a/doc/common/tables/nova-hypervisor.xml +++ b/doc/common/tables/nova-hypervisor.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[DEFAULT]</th> + </tr> <tr> <td>default_ephemeral_format = None</td> <td>(StrOpt) The default format an ephemeral_volume will be formatted with on creation.</td> @@ -47,6 +50,9 @@ <td>virt_mkfs = []</td> <td>(MultiStrOpt) mkfs commands for ephemeral device. The format is <os_type>=<mkfs command></td> </tr> + <tr> + <th colspan="2">[libvirt]</th> + </tr> <tr> <td>block_migration_flag = VIR_MIGRATE_UNDEFINE_SOURCE, VIR_MIGRATE_PEER2PEER, VIR_MIGRATE_NON_SHARED_INC</td> <td>(StrOpt) Migration flags to be set for block migration</td> diff --git a/doc/common/tables/nova-ipv6.xml b/doc/common/tables/nova-ipv6.xml index fba589f11d..ee49c6deda 100644 --- a/doc/common/tables/nova-ipv6.xml +++ b/doc/common/tables/nova-ipv6.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[DEFAULT]</th> + </tr> <tr> <td>fixed_range_v6 = fd00::/48</td> <td>(StrOpt) Fixed IPv6 address block</td> diff --git a/doc/common/tables/nova-keymgr.xml b/doc/common/tables/nova-keymgr.xml index 481964f46a..b1fcfc59dc 100644 --- a/doc/common/tables/nova-keymgr.xml +++ b/doc/common/tables/nova-keymgr.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[keymgr]</th> + </tr> <tr> <td>api_class = nova.keymgr.conf_key_mgr.ConfKeyManager</td> <td>(StrOpt) The full class name of the key manager API class</td> diff --git a/doc/common/tables/nova-kombu.xml b/doc/common/tables/nova-kombu.xml index eced3bac5b..34b137bed9 100644 --- a/doc/common/tables/nova-kombu.xml +++ b/doc/common/tables/nova-kombu.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[DEFAULT]</th> + </tr> <tr> <td>kombu_ssl_ca_certs = </td> <td>(StrOpt) SSL certification authority file (valid only if SSL enabled)</td> diff --git a/doc/common/tables/nova-ldap.xml b/doc/common/tables/nova-ldap.xml index 27865968ca..1d536b35c8 100644 --- a/doc/common/tables/nova-ldap.xml +++ b/doc/common/tables/nova-ldap.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[DEFAULT]</th> + </tr> <tr> <td>ldap_dns_base_dn = ou=hosts,dc=example,dc=org</td> <td>(StrOpt) Base DN for DNS entries in ldap</td> diff --git a/doc/common/tables/nova-libvirt.xml b/doc/common/tables/nova-libvirt.xml index 91fa2e16f4..3d0be249f0 100644 --- a/doc/common/tables/nova-libvirt.xml +++ b/doc/common/tables/nova-libvirt.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[DEFAULT]</th> + </tr> <tr> <td>remove_unused_base_images = True</td> <td>(BoolOpt) Should unused base images be removed?</td> @@ -23,6 +26,9 @@ <td>remove_unused_original_minimum_age_seconds = 86400</td> <td>(IntOpt) Unused unresized base images younger than this will not be removed</td> </tr> + <tr> + <th colspan="2">[libvirt]</th> + </tr> <tr> <td>checksum_base_images = False</td> <td>(BoolOpt) Write a checksum for files in _base to disk</td> diff --git a/doc/common/tables/nova-livemigration.xml b/doc/common/tables/nova-livemigration.xml index 0bf5826f7c..2da5d5f4b3 100644 --- a/doc/common/tables/nova-livemigration.xml +++ b/doc/common/tables/nova-livemigration.xml @@ -15,10 +15,16 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[DEFAULT]</th> + </tr> <tr> <td>live_migration_retry_count = 30</td> <td>(IntOpt) Number of 1 second retries needed in live_migration</td> </tr> + <tr> + <th colspan="2">[libvirt]</th> + </tr> <tr> <td>live_migration_bandwidth = 0</td> <td>(IntOpt) Maximum bandwidth to be used during migration, in Mbps</td> diff --git a/doc/common/tables/nova-logging.xml b/doc/common/tables/nova-logging.xml index 20f6c8c45c..b8e8824476 100644 --- a/doc/common/tables/nova-logging.xml +++ b/doc/common/tables/nova-logging.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[DEFAULT]</th> + </tr> <tr> <td>debug = False</td> <td>(BoolOpt) Print debugging output (set logging level to DEBUG instead of default WARNING level).</td> diff --git a/doc/common/tables/nova-metadata.xml b/doc/common/tables/nova-metadata.xml index 48824ba342..f1114bdae2 100644 --- a/doc/common/tables/nova-metadata.xml +++ b/doc/common/tables/nova-metadata.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[DEFAULT]</th> + </tr> <tr> <td>metadata_host = $my_ip</td> <td>(StrOpt) the ip for the metadata api server</td> diff --git a/doc/common/tables/nova-network.xml b/doc/common/tables/nova-network.xml index 93b28969a9..2ce504d42b 100644 --- a/doc/common/tables/nova-network.xml +++ b/doc/common/tables/nova-network.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[DEFAULT]</th> + </tr> <tr> <td>allow_same_net_traffic = True</td> <td>(BoolOpt) Whether to allow network traffic from same network</td> @@ -247,6 +250,9 @@ <td>vlan_start = 100</td> <td>(IntOpt) First VLAN for private networks</td> </tr> + <tr> + <th colspan="2">[vmware]</th> + </tr> <tr> <td>vlan_interface = vmnic0</td> <td>(StrOpt) Physical ethernet adapter name for vlan networking</td> diff --git a/doc/common/tables/nova-neutron.xml b/doc/common/tables/nova-neutron.xml index cc9ce3cedd..b07a967281 100644 --- a/doc/common/tables/nova-neutron.xml +++ b/doc/common/tables/nova-neutron.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[DEFAULT]</th> + </tr> <tr> <td>neutron_admin_auth_url = http://localhost:5000/v2.0</td> <td>(StrOpt) auth url for connecting to neutron in admin context</td> diff --git a/doc/common/tables/nova-pci.xml b/doc/common/tables/nova-pci.xml index 6e74d701af..1be27819a8 100644 --- a/doc/common/tables/nova-pci.xml +++ b/doc/common/tables/nova-pci.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[DEFAULT]</th> + </tr> <tr> <td>pci_alias = []</td> <td>(MultiStrOpt) An alias for a PCI passthrough device requirement. This allows users to specify the alias in the extra_spec for a flavor, without needing to repeat all the PCI property requirements. For example: pci_alias = { "name": "QuicAssist", "product_id": "0443", "vendor_id": "8086", "device_type": "ACCEL" } defines an alias for the Intel QuickAssist card. (multi valued)</td> diff --git a/doc/common/tables/nova-periodic.xml b/doc/common/tables/nova-periodic.xml index bcfdf9b5aa..e9ee74d932 100644 --- a/doc/common/tables/nova-periodic.xml +++ b/doc/common/tables/nova-periodic.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[DEFAULT]</th> + </tr> <tr> <td>periodic_enable = True</td> <td>(BoolOpt) enable periodic tasks</td> diff --git a/doc/common/tables/nova-policy.xml b/doc/common/tables/nova-policy.xml index 64555c8ab3..bd7bc5e2f2 100644 --- a/doc/common/tables/nova-policy.xml +++ b/doc/common/tables/nova-policy.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[DEFAULT]</th> + </tr> <tr> <td>allow_instance_snapshots = True</td> <td>(BoolOpt) Permit instance snapshot operations.</td> diff --git a/doc/common/tables/nova-qpid.xml b/doc/common/tables/nova-qpid.xml index f7f1781e3d..8d87acb549 100644 --- a/doc/common/tables/nova-qpid.xml +++ b/doc/common/tables/nova-qpid.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[DEFAULT]</th> + </tr> <tr> <td>qpid_heartbeat = 60</td> <td>(IntOpt) Seconds between connection keepalive heartbeats</td> diff --git a/doc/common/tables/nova-quota.xml b/doc/common/tables/nova-quota.xml index a15dcc28ab..8387d094f1 100644 --- a/doc/common/tables/nova-quota.xml +++ b/doc/common/tables/nova-quota.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[DEFAULT]</th> + </tr> <tr> <td>bandwidth_poll_interval = 600</td> <td>(IntOpt) interval to pull bandwidth usage info</td> @@ -75,6 +78,9 @@ <td>quota_security_groups = 10</td> <td>(IntOpt) number of security groups per project</td> </tr> + <tr> + <th colspan="2">[cells]</th> + </tr> <tr> <td>bandwidth_update_interval = 600</td> <td>(IntOpt) Seconds between bandwidth updates for cells.</td> diff --git a/doc/common/tables/nova-rabbitmq.xml b/doc/common/tables/nova-rabbitmq.xml index 76c3e6eb4c..d568129688 100644 --- a/doc/common/tables/nova-rabbitmq.xml +++ b/doc/common/tables/nova-rabbitmq.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[DEFAULT]</th> + </tr> <tr> <td>rabbit_ha_queues = False</td> <td>(BoolOpt) use H/A queues in RabbitMQ (x-ha-policy: all).You need to wipe RabbitMQ database when changing this option.</td> diff --git a/doc/common/tables/nova-redis.xml b/doc/common/tables/nova-redis.xml index 5ae0d1da5d..6ce82f74f0 100644 --- a/doc/common/tables/nova-redis.xml +++ b/doc/common/tables/nova-redis.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[matchmaker_redis]</th> + </tr> <tr> <td>host = 127.0.0.1</td> <td>(StrOpt) Host to locate redis</td> @@ -27,6 +30,9 @@ <td>port = 6379</td> <td>(IntOpt) Use this port to connect to redis host.</td> </tr> + <tr> + <th colspan="2">[remote_debug]</th> + </tr> <tr> <td>host = None</td> <td>(StrOpt) Debug host (ip or name) to connect. Note that using the remote debug option changes how Nova uses the eventlet library to support async IO. This could result in failures that do not occur under normal operation. Use at your own risk.</td> diff --git a/doc/common/tables/nova-rpc.xml b/doc/common/tables/nova-rpc.xml index 67d74f22cf..571fa0f344 100644 --- a/doc/common/tables/nova-rpc.xml +++ b/doc/common/tables/nova-rpc.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[DEFAULT]</th> + </tr> <tr> <td>amqp_auto_delete = False</td> <td>(BoolOpt) Auto-delete queues in amqp.</td> @@ -55,18 +58,30 @@ <td>rpc_thread_pool_size = 64</td> <td>(IntOpt) Size of RPC thread pool</td> </tr> + <tr> + <th colspan="2">[cells]</th> + </tr> <tr> <td>rpc_driver_queue_base = cells.intercell</td> <td>(StrOpt) Base queue name to use when communicating between cells. Various topics by message type will be appended to this.</td> </tr> + <tr> + <th colspan="2">[matchmaker_ring]</th> + </tr> <tr> <td>ringfile = /etc/oslo/matchmaker_ring.json</td> <td>(StrOpt) Matchmaker ring file (JSON)</td> </tr> + <tr> + <th colspan="2">[rpc_notifier2]</th> + </tr> <tr> <td>topics = notifications</td> <td>(ListOpt) AMQP topic(s) used for OpenStack notifications</td> </tr> + <tr> + <th colspan="2">[upgrade_levels]</th> + </tr> <tr> <td>baseapi = None</td> <td>(StrOpt) Set a version cap for messages sent to the base api in any service</td> diff --git a/doc/common/tables/nova-s3.xml b/doc/common/tables/nova-s3.xml index a0666c407e..5343597b25 100644 --- a/doc/common/tables/nova-s3.xml +++ b/doc/common/tables/nova-s3.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[DEFAULT]</th> + </tr> <tr> <td>buckets_path = $state_path/buckets</td> <td>(StrOpt) path to s3 buckets</td> diff --git a/doc/common/tables/nova-scheduling.xml b/doc/common/tables/nova-scheduling.xml index 6f78e8c44b..54cb3d7286 100644 --- a/doc/common/tables/nova-scheduling.xml +++ b/doc/common/tables/nova-scheduling.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[DEFAULT]</th> + </tr> <tr> <td>aggregate_image_properties_isolation_namespace = None</td> <td>(StrOpt) Force the filter to consider only keys matching the given namespace.</td> @@ -107,6 +110,9 @@ <td>scheduler_weight_classes = nova.scheduler.weights.all_weighers</td> <td>(ListOpt) Which weight class names to use for weighing hosts</td> </tr> + <tr> + <th colspan="2">[cells]</th> + </tr> <tr> <td>ram_weight_multiplier = 10.0</td> <td>(FloatOpt) Multiplier used for weighing ram. Negative numbers mean to stack vs spread.</td> @@ -127,6 +133,9 @@ <td>scheduler_weight_classes = nova.cells.weights.all_weighers</td> <td>(ListOpt) Weigher classes the cells scheduler should use. An entry of "nova.cells.weights.all_weighers"maps to all cell weighers included with nova.</td> </tr> + <tr> + <th colspan="2">[metrics]</th> + </tr> <tr> <td>weight_multiplier = 1.0</td> <td>(FloatOpt) Multiplier used for weighing metrics.</td> diff --git a/doc/common/tables/nova-spice.xml b/doc/common/tables/nova-spice.xml index 54e7a1bd9d..4d5d75c71b 100644 --- a/doc/common/tables/nova-spice.xml +++ b/doc/common/tables/nova-spice.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[spice]</th> + </tr> <tr> <td>agent_enabled = True</td> <td>(BoolOpt) enable spice guest agent support</td> diff --git a/doc/common/tables/nova-testing.xml b/doc/common/tables/nova-testing.xml index 5e5bd7ede9..4293733f66 100644 --- a/doc/common/tables/nova-testing.xml +++ b/doc/common/tables/nova-testing.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[DEFAULT]</th> + </tr> <tr> <td>allowed_rpc_exception_modules = nova.exception, cinder.exception, exceptions</td> <td>(ListOpt) Modules of exceptions that are permitted to be recreatedupon receiving exception data from an rpc call.</td> diff --git a/doc/common/tables/nova-tilera.xml b/doc/common/tables/nova-tilera.xml index ec2a2855df..8a0cbde507 100644 --- a/doc/common/tables/nova-tilera.xml +++ b/doc/common/tables/nova-tilera.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[baremetal]</th> + </tr> <tr> <td>tile_pdu_ip = 10.0.100.1</td> <td>(StrOpt) ip address of tilera pdu</td> diff --git a/doc/common/tables/nova-trustedcomputing.xml b/doc/common/tables/nova-trustedcomputing.xml index b93d3b7b9b..217fb7cc8e 100644 --- a/doc/common/tables/nova-trustedcomputing.xml +++ b/doc/common/tables/nova-trustedcomputing.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[trusted_computing]</th> + </tr> <tr> <td>attestation_api_url = /OpenAttestationWebServices/V1.0</td> <td>(StrOpt) attestation web API URL</td> diff --git a/doc/common/tables/nova-upgrade_levels.xml b/doc/common/tables/nova-upgrade_levels.xml index 2b98758379..e9bfccd2d6 100644 --- a/doc/common/tables/nova-upgrade_levels.xml +++ b/doc/common/tables/nova-upgrade_levels.xml @@ -15,10 +15,16 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[cells]</th> + </tr> <tr> <td>scheduler = nova.cells.scheduler.CellsScheduler</td> <td>(StrOpt) Cells scheduler to use</td> </tr> + <tr> + <th colspan="2">[upgrade_levels]</th> + </tr> <tr> <td>cells = None</td> <td>(StrOpt) Set a version cap for messages sent to local cells services</td> diff --git a/doc/common/tables/nova-vmware.xml b/doc/common/tables/nova-vmware.xml index 6e70ee195e..bf38244c2e 100644 --- a/doc/common/tables/nova-vmware.xml +++ b/doc/common/tables/nova-vmware.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[vmware]</th> + </tr> <tr> <td>api_retry_count = 10</td> <td>(IntOpt) The number of times we retry on failures, e.g., socket error, etc.</td> diff --git a/doc/common/tables/nova-vnc.xml b/doc/common/tables/nova-vnc.xml index 40bda51d91..6add230d39 100644 --- a/doc/common/tables/nova-vnc.xml +++ b/doc/common/tables/nova-vnc.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[DEFAULT]</th> + </tr> <tr> <td>novncproxy_base_url = http://127.0.0.1:6080/vnc_auto.html</td> <td>(StrOpt) location of vnc console proxy, in the form "http://127.0.0.1:6080/vnc_auto.html"</td> @@ -35,6 +38,9 @@ <td>vncserver_proxyclient_address = 127.0.0.1</td> <td>(StrOpt) the address to which proxy clients (like nova-xvpvncproxy) should connect</td> </tr> + <tr> + <th colspan="2">[vmware]</th> + </tr> <tr> <td>vnc_port = 5900</td> <td>(IntOpt) VNC starting port</td> diff --git a/doc/common/tables/nova-volumes.xml b/doc/common/tables/nova-volumes.xml index c742670edd..de8909a713 100644 --- a/doc/common/tables/nova-volumes.xml +++ b/doc/common/tables/nova-volumes.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[DEFAULT]</th> + </tr> <tr> <td>cinder_api_insecure = False</td> <td>(BoolOpt) Allow to perform insecure SSL requests to cinder</td> @@ -51,6 +54,9 @@ <td>volume_usage_poll_interval = 0</td> <td>(IntOpt) Interval in seconds for gathering volume usages</td> </tr> + <tr> + <th colspan="2">[baremetal]</th> + </tr> <tr> <td>iscsi_iqn_prefix = iqn.2010-10.org.openstack.baremetal</td> <td>(StrOpt) iSCSI IQN prefix used in baremetal volume connections.</td> @@ -59,6 +65,9 @@ <td>volume_driver = nova.virt.baremetal.volume_driver.LibvirtVolumeDriver</td> <td>(StrOpt) Baremetal volume driver.</td> </tr> + <tr> + <th colspan="2">[hyperv]</th> + </tr> <tr> <td>force_volumeutils_v1 = False</td> <td>(BoolOpt) Force V1 volume utility class</td> @@ -71,6 +80,9 @@ <td>volume_attach_retry_interval = 5</td> <td>(IntOpt) Interval between volume attachment attempts, in seconds</td> </tr> + <tr> + <th colspan="2">[libvirt]</th> + </tr> <tr> <td>glusterfs_mount_point_base = $state_path/mnt</td> <td>(StrOpt) Dir where the glusterfs volume is mounted on the compute node</td> @@ -115,6 +127,9 @@ <td>scality_sofs_mount_point = $state_path/scality</td> <td>(StrOpt) Base dir where Scality SOFS shall be mounted</td> </tr> + <tr> + <th colspan="2">[xenserver]</th> + </tr> <tr> <td>block_device_creation_timeout = 10</td> <td>(IntOpt) Time to wait for a block device to be created</td> diff --git a/doc/common/tables/nova-vpn.xml b/doc/common/tables/nova-vpn.xml index 6768cacd5b..72546ce39f 100644 --- a/doc/common/tables/nova-vpn.xml +++ b/doc/common/tables/nova-vpn.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[DEFAULT]</th> + </tr> <tr> <td>boot_script_template = $pybasedir/nova/cloudpipe/bootscript.template</td> <td>(StrOpt) Template for cloudpipe instance boot script</td> diff --git a/doc/common/tables/nova-wsgi.xml b/doc/common/tables/nova-wsgi.xml index 5a7d046c7d..fd5b3d6cb2 100644 --- a/doc/common/tables/nova-wsgi.xml +++ b/doc/common/tables/nova-wsgi.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[DEFAULT]</th> + </tr> <tr> <td>api_paste_config = api-paste.ini</td> <td>(StrOpt) File name for the paste.deploy config for nova-api</td> diff --git a/doc/common/tables/nova-xen.xml b/doc/common/tables/nova-xen.xml index 456769aad0..d892b82129 100644 --- a/doc/common/tables/nova-xen.xml +++ b/doc/common/tables/nova-xen.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[DEFAULT]</th> + </tr> <tr> <td>console_driver = nova.console.xvp.XVPConsoleProxy</td> <td>(StrOpt) Driver to use for the console proxy</td> @@ -51,10 +54,16 @@ <td>stub_compute = False</td> <td>(BoolOpt) Stub calls to compute worker for tests</td> </tr> + <tr> + <th colspan="2">[libvirt]</th> + </tr> <tr> <td>xen_hvmloader_path = /usr/lib/xen/boot/hvmloader</td> <td>(StrOpt) Location where the Xen hvmloader is kept</td> </tr> + <tr> + <th colspan="2">[xenserver]</th> + </tr> <tr> <td>agent_path = usr/sbin/xe-update-networking</td> <td>(StrOpt) Specifies the path in which the xenapi guest agent should be located. If the agent is present, network configuration is not injected into the image. Used if compute_driver=xenapi.XenAPIDriver and flat_injected=True</td> diff --git a/doc/common/tables/nova-xvpnvncproxy.xml b/doc/common/tables/nova-xvpnvncproxy.xml index 19d955c373..c623b136c1 100644 --- a/doc/common/tables/nova-xvpnvncproxy.xml +++ b/doc/common/tables/nova-xvpnvncproxy.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[DEFAULT]</th> + </tr> <tr> <td>xvpvncproxy_base_url = http://127.0.0.1:6081/console</td> <td>(StrOpt) location of nova xvp vnc console proxy, in the form "http://127.0.0.1:6081/console"</td> diff --git a/doc/common/tables/nova-zeromq.xml b/doc/common/tables/nova-zeromq.xml index 1dd5e5703e..56ce043e32 100644 --- a/doc/common/tables/nova-zeromq.xml +++ b/doc/common/tables/nova-zeromq.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[DEFAULT]</th> + </tr> <tr> <td>rpc_zmq_bind_address = *</td> <td>(StrOpt) ZeroMQ bind address. Should be a wildcard (*), an ethernet interface, or IP. The "host" option should point or resolve to this address.</td> diff --git a/doc/common/tables/nova-zookeeper.xml b/doc/common/tables/nova-zookeeper.xml index e71e5134e9..0f0a4f5cb8 100644 --- a/doc/common/tables/nova-zookeeper.xml +++ b/doc/common/tables/nova-zookeeper.xml @@ -15,6 +15,9 @@ </tr> </thead> <tbody> + <tr> + <th colspan="2">[zookeeper]</th> + </tr> <tr> <td>address = None</td> <td>(StrOpt) The ZooKeeper addresses for servicegroup service in the format of host1:port,host2:port,host3:port</td>