From 590bb27b371f47722341014c2f1b7b8867c37002 Mon Sep 17 00:00:00 2001 From: Gauvain Pocentek Date: Tue, 11 Mar 2014 19:00:22 +0100 Subject: [PATCH] update nova flags and tables Removed docker references (the driver has been removed from nova). Update confilcting pages including tables to use xrefs instead. Add a rpc_all section to handle conflicts in the training-guides. Closes-Bug: #1291138 Closes-Bug: #1292612 Change-Id: I67ad31c3913cae4c2e9e3d2ce41302717af5d839 --- doc/common/section_compute-configure-ec2.xml | 6 +- .../section_compute-configure-spice.xml | 5 +- doc/common/section_compute-configure-vnc.xml | 3 +- doc/common/section_compute_config-api.xml | 4 +- doc/common/section_trusted-compute-pools.xml | 4 +- doc/common/tables/nova-api.xml | 9 +- doc/common/tables/nova-apiv3.xml | 2 +- doc/common/tables/nova-authentication.xml | 2 +- doc/common/tables/nova-availabilityzones.xml | 2 +- doc/common/tables/nova-baremetal.xml | 6 +- doc/common/tables/nova-ca.xml | 8 +- doc/common/tables/nova-cells.xml | 2 +- doc/common/tables/nova-common.xml | 8 +- doc/common/tables/nova-compute.xml | 14 +- doc/common/tables/nova-conductor.xml | 2 +- doc/common/tables/nova-configdrive.xml | 2 +- doc/common/tables/nova-console.xml | 2 +- doc/common/tables/nova-db.xml | 46 +++- doc/common/tables/nova-docker.xml | 27 --- doc/common/tables/nova-ec2.xml | 2 +- doc/common/tables/nova-fping.xml | 2 +- doc/common/tables/nova-glance.xml | 2 +- doc/common/tables/nova-hyperv.xml | 2 +- doc/common/tables/nova-hypervisor.xml | 2 +- doc/common/tables/nova-ipv6.xml | 2 +- doc/common/tables/nova-keymgr.xml | 2 +- doc/common/tables/nova-kombu.xml | 14 +- doc/common/tables/nova-ldap.xml | 2 +- doc/common/tables/nova-libvirt.xml | 2 +- doc/common/tables/nova-livemigration.xml | 2 +- doc/common/tables/nova-logging.xml | 10 +- doc/common/tables/nova-metadata.xml | 2 +- doc/common/tables/nova-network.xml | 2 +- doc/common/tables/nova-neutron.xml | 2 +- doc/common/tables/nova-pci.xml | 2 +- doc/common/tables/nova-periodic.xml | 2 +- doc/common/tables/nova-policy.xml | 2 +- doc/common/tables/nova-qpid.xml | 20 +- doc/common/tables/nova-quota.xml | 2 +- doc/common/tables/nova-rabbitmq.xml | 26 ++- doc/common/tables/nova-rdp.xml | 2 +- doc/common/tables/nova-redis.xml | 4 +- doc/common/tables/nova-rpc.xml | 12 +- doc/common/tables/nova-rpc_all.xml | 220 ++++++++++++++++++ doc/common/tables/nova-s3.xml | 2 +- doc/common/tables/nova-scheduling.xml | 2 +- doc/common/tables/nova-spice.xml | 2 +- doc/common/tables/nova-testing.xml | 6 +- doc/common/tables/nova-tilera.xml | 2 +- doc/common/tables/nova-trustedcomputing.xml | 2 +- doc/common/tables/nova-upgrade_levels.xml | 2 +- doc/common/tables/nova-vmware.xml | 4 +- doc/common/tables/nova-vnc.xml | 2 +- doc/common/tables/nova-volumes.xml | 2 +- doc/common/tables/nova-vpn.xml | 2 +- doc/common/tables/nova-wsgi.xml | 2 +- doc/common/tables/nova-xen.xml | 4 +- doc/common/tables/nova-xvpnvncproxy.xml | 2 +- doc/common/tables/nova-zeromq.xml | 10 +- doc/common/tables/nova-zookeeper.xml | 2 +- doc/config-reference/ch_computeconfigure.xml | 26 +-- doc/config-reference/ch_imageservice.xml | 7 +- .../compute/section_compute-cells.xml | 4 +- .../compute/section_compute-conductor.xml | 3 +- .../compute/section_compute-configure-db.xml | 4 +- ...ction_compute-configure-service-groups.xml | 4 +- .../compute/section_compute-configure-xen.xml | 3 +- .../compute/section_compute-hypervisors.xml | 13 +- .../section_compute-options-reference.xml | 6 +- .../compute/section_compute-scheduler.xml | 4 +- .../compute/section_hypervisor_baremetal.xml | 4 +- .../compute/section_hypervisor_docker.xml | 45 ---- .../compute/section_hypervisor_hyper-v.xml | 4 +- .../compute/section_hypervisor_vmware.xml | 3 +- .../compute/section_nova-conf.xml | 5 +- .../nova.flagmappings | 123 +++++----- 76 files changed, 498 insertions(+), 304 deletions(-) delete mode 100644 doc/common/tables/nova-docker.xml create mode 100644 doc/common/tables/nova-rpc_all.xml delete mode 100644 doc/config-reference/compute/section_hypervisor_docker.xml diff --git a/doc/common/section_compute-configure-ec2.xml b/doc/common/section_compute-configure-ec2.xml index 5e13fb0968..7e704669c8 100644 --- a/doc/common/section_compute-configure-ec2.xml +++ b/doc/common/section_compute-configure-ec2.xml @@ -11,7 +11,7 @@ configuration file to control which network address and port the EC2 API listens on, the formatting of some API responses, and authentication related options. - To customize these options for OpenStack EC2 API, use these - configuration option settings: - + To customize these options for OpenStack EC2 API, use the configuration + option settings documented in . diff --git a/doc/common/section_compute-configure-spice.xml b/doc/common/section_compute-configure-spice.xml index 0cd8961d43..93b9c2ae80 100644 --- a/doc/common/section_compute-configure-spice.xml +++ b/doc/common/section_compute-configure-spice.xml @@ -19,7 +19,6 @@ VNC must be explicitly disabled to get access to the SPICE console. Set the option to False in the [DEFAULT] section to disable the VNC console. - The following table shows the options to configure SPICE as - the console for OpenStack Compute: - + documents the options to + configure SPICE as the console for OpenStack Compute. diff --git a/doc/common/section_compute-configure-vnc.xml b/doc/common/section_compute-configure-vnc.xml index 7e7263d8cf..6df88b248c 100644 --- a/doc/common/section_compute-configure-vnc.xml +++ b/doc/common/section_compute-configure-vnc.xml @@ -118,7 +118,8 @@
VNC configuration options - + To customize the VNC console, use the configuration option settings + documented in . To support Configuration reference - The following table lists the Compute API configuration options: - + The Compute API configuration options are documented in .
diff --git a/doc/common/section_trusted-compute-pools.xml b/doc/common/section_trusted-compute-pools.xml index bb9cbc7c51..83adcce80d 100644 --- a/doc/common/section_trusted-compute-pools.xml +++ b/doc/common/section_trusted-compute-pools.xml @@ -138,7 +138,9 @@ auth_blob=i-am-openstack
Configuration reference - + To customize the trusted compute pools, use the configuration + option settings documented in .
diff --git a/doc/common/tables/nova-api.xml b/doc/common/tables/nova-api.xml index 5748183153..4941c8aa53 100644 --- a/doc/common/tables/nova-api.xml +++ b/doc/common/tables/nova-api.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> - +
@@ -90,13 +90,6 @@ - - - - - - -
Description of configuration options for api
use_forwarded_for = False (BoolOpt) Treat X-Forwarded-For as the canonical remote address. Only enable this if you have a sanitizing proxy.
[database]
use_tpool = False(BoolOpt) Enable the experimental use of thread pooling for all DB API calls
diff --git a/doc/common/tables/nova-apiv3.xml b/doc/common/tables/nova-apiv3.xml index 8304bf6fbc..99fcdae8c4 100644 --- a/doc/common/tables/nova-apiv3.xml +++ b/doc/common/tables/nova-apiv3.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> - +
diff --git a/doc/common/tables/nova-authentication.xml b/doc/common/tables/nova-authentication.xml index 242be14bb2..f605f05693 100644 --- a/doc/common/tables/nova-authentication.xml +++ b/doc/common/tables/nova-authentication.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for apiv3
+
diff --git a/doc/common/tables/nova-availabilityzones.xml b/doc/common/tables/nova-availabilityzones.xml index a75e021e97..e0a81c6d63 100644 --- a/doc/common/tables/nova-availabilityzones.xml +++ b/doc/common/tables/nova-availabilityzones.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for authentication
+
diff --git a/doc/common/tables/nova-baremetal.xml b/doc/common/tables/nova-baremetal.xml index cde0fd32c5..d7a2d811c2 100644 --- a/doc/common/tables/nova-baremetal.xml +++ b/doc/common/tables/nova-baremetal.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for availabilityzones
+
@@ -56,7 +56,7 @@ - + @@ -71,7 +71,7 @@ - + diff --git a/doc/common/tables/nova-ca.xml b/doc/common/tables/nova-ca.xml index ad73eb1c04..79842f2d09 100644 --- a/doc/common/tables/nova-ca.xml +++ b/doc/common/tables/nova-ca.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for baremetal
pxe_bootfile_name = pxelinux.0(StrOpt) This gets passed to Neutron as the bootfile dhcp parameter when the dhcp_options_enabled is set.(StrOpt) This gets passed to Neutron as the bootfile dhcp parameter.
pxe_config_template = $pybasedir/nova/virt/baremetal/pxe_config.template(BoolOpt) If set, pass the network configuration details to the initramfs via cmdline.
sql_connection = sqlite:///$state_path/baremetal_$sqlite_dbsql_connection = sqlite:///$state_path/baremetal_nova.sqlite (StrOpt) The SQLAlchemy connection string used to connect to the bare-metal database
+
@@ -63,15 +63,15 @@ - + - + - +
Description of configuration options for ca
ca_file = None(StrOpt) CA certificate file to use to verify connecting clients(StrOpt) CA certificate file to use to verify connecting clients.
cert_file = None(StrOpt) Certificate file to use when starting the server securely(StrOpt) Certificate file to use when starting the server securely.
key_file = None(StrOpt) Private key file to use when starting the server securely(StrOpt) Private key file to use when starting the server securely.
diff --git a/doc/common/tables/nova-cells.xml b/doc/common/tables/nova-cells.xml index 9ba4a1cb68..d8c1974384 100644 --- a/doc/common/tables/nova-cells.xml +++ b/doc/common/tables/nova-cells.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> - +
diff --git a/doc/common/tables/nova-common.xml b/doc/common/tables/nova-common.xml index 3e3160686e..09ee2c1a11 100644 --- a/doc/common/tables/nova-common.xml +++ b/doc/common/tables/nova-common.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for cells
+
@@ -56,11 +56,11 @@ - + - + @@ -91,7 +91,7 @@ - + diff --git a/doc/common/tables/nova-compute.xml b/doc/common/tables/nova-compute.xml index c34be2de12..c8b3573423 100644 --- a/doc/common/tables/nova-compute.xml +++ b/doc/common/tables/nova-compute.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for common
notification_driver = [](MultiStrOpt) Driver or drivers to handle sending notifications(MultiStrOpt) Driver or drivers to handle sending notifications.
notification_topics = notifications(ListOpt) AMQP topic used for OpenStack notifications(ListOpt) AMQP topic used for OpenStack notifications.
notify_api_faults = False(IntOpt) Maximum time since last check-in for up service
state_path = /var/lib/novastate_path = $pybasedir (StrOpt) Top-level directory for maintaining nova's state
+
@@ -74,6 +74,10 @@ + + + + @@ -138,6 +142,14 @@ + + + + + + + +
Description of configuration options for compute
image_cache_subdirectory_name = _base (StrOpt) Where cached images are stored under $instances_path. This is NOT the full path - just a folder name. For per-compute-host cached images, set to _base_$my_ip
image_handlers = download(ListOpt) Specifies which image handler extension names to use for handling images. The first extension in the list which can handle the image with a suitable location will be used.
instance_build_timeout = 0 (IntOpt) Amount of time in seconds an instance can be in BUILD before going into ERROR status.Set to 0 to disable.sync_power_state_interval = 600 (IntOpt) Interval to sync power states between the database and the hypervisor
vif_plugging_is_fatal = True(BoolOpt) Fail instance boot if vif plugging fails
vif_plugging_timeout = 300(IntOpt) Number of seconds to wait for neutron vif plugging events to arrive before continuing or failing (see vif_plugging_is_fatal). If this is set to zero and vif_plugging_is_fatal is False, events should not be expected to arrive at all.
diff --git a/doc/common/tables/nova-conductor.xml b/doc/common/tables/nova-conductor.xml index 83d4583d64..8198e8dc7d 100644 --- a/doc/common/tables/nova-conductor.xml +++ b/doc/common/tables/nova-conductor.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> - +
diff --git a/doc/common/tables/nova-configdrive.xml b/doc/common/tables/nova-configdrive.xml index a323447002..2a9bae274f 100644 --- a/doc/common/tables/nova-configdrive.xml +++ b/doc/common/tables/nova-configdrive.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for conductor
+
diff --git a/doc/common/tables/nova-console.xml b/doc/common/tables/nova-console.xml index a9317b8a85..fda487ef60 100644 --- a/doc/common/tables/nova-console.xml +++ b/doc/common/tables/nova-console.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for configdrive
+
diff --git a/doc/common/tables/nova-db.xml b/doc/common/tables/nova-db.xml index 9fd8d15e2f..9fc955a00d 100644 --- a/doc/common/tables/nova-db.xml +++ b/doc/common/tables/nova-db.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for console
+
@@ -22,14 +22,6 @@ - - - - - - - - @@ -45,7 +37,7 @@ - + @@ -56,6 +48,22 @@ + + + + + + + + + + + + + + + + @@ -76,6 +84,10 @@ + + + + @@ -85,9 +97,21 @@ - + + + + + + + + + + + + +
Description of configuration options for db
db_driver = nova.db (StrOpt) The driver to use for database access
sqlite_db = nova.sqlite(StrOpt) The file name to use with SQLite
sqlite_synchronous = True(BoolOpt) If True, SQLite uses synchronous mode
[cells]
(StrOpt) The backend to use for db
connection = sqlite:////usr/lib/python/site-packages/nova/openstack/common/db/$sqlite_dbconnection = None (StrOpt) The SQLAlchemy connection string used to connect to the database
connection_trace = False (BoolOpt) Add python stack traces to SQL as comment strings
db_inc_retry_interval = True(BoolOpt) Whether to increase interval between db connection retries, up to db_max_retry_interval
db_max_retries = 20(IntOpt) maximum db connection retries before error is raised. (setting -1 implies an infinite retry count)
db_max_retry_interval = 10(IntOpt) max seconds between db connection retries, if db_inc_retry_interval is enabled
db_retry_interval = 1(IntOpt) seconds between db connection retries
idle_timeout = 3600 (IntOpt) Timeout before idle sql connections are reapedmin_pool_size = 1 (IntOpt) Minimum number of SQL connections to keep open in a pool
mysql_sql_mode = None(StrOpt) The SQL mode to be used for MySQL sessions (default is empty, meaning do not override any server-side SQL mode setting)
pool_timeout = None (IntOpt) If set, use this value for pool_timeout with sqlalchemy(IntOpt) Interval between retries of opening a sql connection
slave_connection = slave_connection = None (StrOpt) The SQLAlchemy connection string used to connect to the slave database
sqlite_db = nova.sqlite(StrOpt) The file name to use with SQLite
sqlite_synchronous = True(BoolOpt) If True, SQLite uses synchronous mode
use_db_reconnect = False(BoolOpt) Enable the experimental use of database reconnect on connection lost
diff --git a/doc/common/tables/nova-docker.xml b/doc/common/tables/nova-docker.xml deleted file mode 100644 index 61a53bdc15..0000000000 --- a/doc/common/tables/nova-docker.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - -
Description of configuration options for docker
Configuration option = Default valueDescription
[docker]
registry_default_port = 5042(IntOpt) Default TCP port to find the docker-registry container
- diff --git a/doc/common/tables/nova-ec2.xml b/doc/common/tables/nova-ec2.xml index 9ebaa074bb..2a045e6b66 100644 --- a/doc/common/tables/nova-ec2.xml +++ b/doc/common/tables/nova-ec2.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> - +
diff --git a/doc/common/tables/nova-fping.xml b/doc/common/tables/nova-fping.xml index 7c647eb5c7..c7105981b6 100644 --- a/doc/common/tables/nova-fping.xml +++ b/doc/common/tables/nova-fping.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for ec2
+
diff --git a/doc/common/tables/nova-glance.xml b/doc/common/tables/nova-glance.xml index 9ae65648c2..3795227be0 100644 --- a/doc/common/tables/nova-glance.xml +++ b/doc/common/tables/nova-glance.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for fping
+
diff --git a/doc/common/tables/nova-hyperv.xml b/doc/common/tables/nova-hyperv.xml index c9af280293..f6ae5a023c 100644 --- a/doc/common/tables/nova-hyperv.xml +++ b/doc/common/tables/nova-hyperv.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for glance
+
diff --git a/doc/common/tables/nova-hypervisor.xml b/doc/common/tables/nova-hypervisor.xml index 0699bb6300..78304c0662 100644 --- a/doc/common/tables/nova-hypervisor.xml +++ b/doc/common/tables/nova-hypervisor.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for hyperv
+
diff --git a/doc/common/tables/nova-ipv6.xml b/doc/common/tables/nova-ipv6.xml index 760b29e801..e1c5bd87c3 100644 --- a/doc/common/tables/nova-ipv6.xml +++ b/doc/common/tables/nova-ipv6.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for hypervisor
+
diff --git a/doc/common/tables/nova-keymgr.xml b/doc/common/tables/nova-keymgr.xml index b1fcfc59dc..f10c08e496 100644 --- a/doc/common/tables/nova-keymgr.xml +++ b/doc/common/tables/nova-keymgr.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for ipv6
+
diff --git a/doc/common/tables/nova-kombu.xml b/doc/common/tables/nova-kombu.xml index 34b137bed9..3e442f8dff 100644 --- a/doc/common/tables/nova-kombu.xml +++ b/doc/common/tables/nova-kombu.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for keymgr
+
@@ -18,21 +18,25 @@ + + + + - + - + - + - +
Description of configuration options for kombu
[DEFAULT]
kombu_reconnect_delay = 1.0(FloatOpt) How long to wait before reconnecting in response to an AMQP consumer cancel notification.
kombu_ssl_ca_certs = (StrOpt) SSL certification authority file (valid only if SSL enabled)(StrOpt) SSL certification authority file (valid only if SSL enabled).
kombu_ssl_certfile = (StrOpt) SSL cert file (valid only if SSL enabled)(StrOpt) SSL cert file (valid only if SSL enabled).
kombu_ssl_keyfile = (StrOpt) SSL key file (valid only if SSL enabled)(StrOpt) SSL key file (valid only if SSL enabled).
kombu_ssl_version = (StrOpt) SSL version to use (valid only if SSL enabled). valid values are TLSv1, SSLv23 and SSLv3. SSLv2 may be available on some distributions(StrOpt) SSL version to use (valid only if SSL enabled). valid values are TLSv1, SSLv23 and SSLv3. SSLv2 may be available on some distributions.
diff --git a/doc/common/tables/nova-ldap.xml b/doc/common/tables/nova-ldap.xml index 1949478623..90058eb816 100644 --- a/doc/common/tables/nova-ldap.xml +++ b/doc/common/tables/nova-ldap.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> - +
diff --git a/doc/common/tables/nova-libvirt.xml b/doc/common/tables/nova-libvirt.xml index 0b7b60ad2e..530b511570 100644 --- a/doc/common/tables/nova-libvirt.xml +++ b/doc/common/tables/nova-libvirt.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for ldap
+
diff --git a/doc/common/tables/nova-livemigration.xml b/doc/common/tables/nova-livemigration.xml index 2da5d5f4b3..0497e215f5 100644 --- a/doc/common/tables/nova-livemigration.xml +++ b/doc/common/tables/nova-livemigration.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for libvirt
+
diff --git a/doc/common/tables/nova-logging.xml b/doc/common/tables/nova-logging.xml index e58ee3c186..0e15a09319 100644 --- a/doc/common/tables/nova-logging.xml +++ b/doc/common/tables/nova-logging.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for livemigration
+
@@ -86,6 +86,10 @@ + + + + @@ -94,10 +98,6 @@ - - - - diff --git a/doc/common/tables/nova-metadata.xml b/doc/common/tables/nova-metadata.xml index abc09cd4fb..15c31d25d8 100644 --- a/doc/common/tables/nova-metadata.xml +++ b/doc/common/tables/nova-metadata.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for logging
syslog-log-facility = LOG_USER (StrOpt) syslog facility to receive log lines
use_stderr = True(BoolOpt) Log output to standard error
use-syslog = False (BoolOpt) Use syslog for logging. Existing syslog format is DEPRECATED during I, and then will be changed in J to honor RFC5424use-syslog-rfc-format = False (BoolOpt) (Optional) Use syslog rfc5424 format for logging. If enabled, will add APP-NAME (RFC5424) before the MSG part of the syslog message. The old format without APP-NAME is deprecated in I, and will be removed in J.
use_stderr = True(BoolOpt) Log output to standard error
verbose = False (BoolOpt) Print more verbose output (set logging level to INFO instead of default WARNING level).
+
diff --git a/doc/common/tables/nova-network.xml b/doc/common/tables/nova-network.xml index 6285d1ccac..4892eaf386 100644 --- a/doc/common/tables/nova-network.xml +++ b/doc/common/tables/nova-network.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for metadata
+
diff --git a/doc/common/tables/nova-neutron.xml b/doc/common/tables/nova-neutron.xml index 28f77e091a..9edf44e436 100644 --- a/doc/common/tables/nova-neutron.xml +++ b/doc/common/tables/nova-neutron.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for network
+
diff --git a/doc/common/tables/nova-pci.xml b/doc/common/tables/nova-pci.xml index 1be27819a8..0d21ffa7ee 100644 --- a/doc/common/tables/nova-pci.xml +++ b/doc/common/tables/nova-pci.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for neutron
+
diff --git a/doc/common/tables/nova-periodic.xml b/doc/common/tables/nova-periodic.xml index ee85235a48..7e3b7641cf 100644 --- a/doc/common/tables/nova-periodic.xml +++ b/doc/common/tables/nova-periodic.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for pci
+
diff --git a/doc/common/tables/nova-policy.xml b/doc/common/tables/nova-policy.xml index 03fa84db1b..b1101cc72d 100644 --- a/doc/common/tables/nova-policy.xml +++ b/doc/common/tables/nova-policy.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for periodic
+
diff --git a/doc/common/tables/nova-qpid.xml b/doc/common/tables/nova-qpid.xml index 5b54d12b12..bf60046ce6 100644 --- a/doc/common/tables/nova-qpid.xml +++ b/doc/common/tables/nova-qpid.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for policy
+
@@ -20,35 +20,35 @@ - + - + - + - + - + - + - + - + @@ -56,7 +56,7 @@ - +
Description of configuration options for qpid
qpid_heartbeat = 60(IntOpt) Seconds between connection keepalive heartbeats(IntOpt) Seconds between connection keepalive heartbeats.
qpid_hostname = oslo(StrOpt) Qpid broker hostname(StrOpt) Qpid broker hostname.
qpid_hosts = $qpid_hostname:$qpid_port(ListOpt) Qpid HA cluster host:port pairs(ListOpt) Qpid HA cluster host:port pairs.
qpid_password = (StrOpt) Password for Qpid connection(StrOpt) Password for Qpid connection.
qpid_port = 5672(IntOpt) Qpid broker port(IntOpt) Qpid broker port.
qpid_protocol = tcp(StrOpt) Transport to use, either 'tcp' or 'ssl'(StrOpt) Transport to use, either 'tcp' or 'ssl'.
qpid_sasl_mechanisms = (StrOpt) Space separated list of SASL mechanisms to use for auth(StrOpt) Space separated list of SASL mechanisms to use for auth.
qpid_tcp_nodelay = True(BoolOpt) Disable Nagle algorithm(BoolOpt) Whether to disable the Nagle algorithm.
qpid_topology_version = 1
qpid_username = (StrOpt) Username for Qpid connection(StrOpt) Username for Qpid connection.
diff --git a/doc/common/tables/nova-quota.xml b/doc/common/tables/nova-quota.xml index 83b660c43b..cb67cf162c 100644 --- a/doc/common/tables/nova-quota.xml +++ b/doc/common/tables/nova-quota.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> - +
diff --git a/doc/common/tables/nova-rabbitmq.xml b/doc/common/tables/nova-rabbitmq.xml index a3b2e421f7..67c5ed8a9b 100644 --- a/doc/common/tables/nova-rabbitmq.xml +++ b/doc/common/tables/nova-rabbitmq.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for quota
+
@@ -24,43 +24,47 @@ - + - + + + + + - + - + - + - + - + - + - + - +
Description of configuration options for rabbitmq
rabbit_host = oslo(StrOpt) The RabbitMQ broker address where a single node is used(StrOpt) The RabbitMQ broker address where a single node is used.
rabbit_hosts = $rabbit_host:$rabbit_port(ListOpt) RabbitMQ HA cluster host:port pairs(ListOpt) RabbitMQ HA cluster host:port pairs.
rabbit_login_method = AMQPLAIN(StrOpt) the RabbitMQ login method
rabbit_max_retries = 0(IntOpt) Maximum number of RabbitMQ connection retries. Default is 0 (infinite retry count)(IntOpt) Maximum number of RabbitMQ connection retries. Default is 0 (infinite retry count).
rabbit_password = guest(StrOpt) The RabbitMQ password(StrOpt) The RabbitMQ password.
rabbit_port = 5672(IntOpt) The RabbitMQ broker port where a single node is used(IntOpt) The RabbitMQ broker port where a single node is used.
rabbit_retry_backoff = 2(IntOpt) How long to backoff for between retries when connecting to RabbitMQ(IntOpt) How long to backoff for between retries when connecting to RabbitMQ.
rabbit_retry_interval = 1(IntOpt) How frequently to retry connecting with RabbitMQ(IntOpt) How frequently to retry connecting with RabbitMQ.
rabbit_use_ssl = False(BoolOpt) Connect over SSL for RabbitMQ(BoolOpt) Connect over SSL for RabbitMQ.
rabbit_userid = guest(StrOpt) The RabbitMQ userid(StrOpt) The RabbitMQ userid.
rabbit_virtual_host = /(StrOpt) The RabbitMQ virtual host(StrOpt) The RabbitMQ virtual host.
diff --git a/doc/common/tables/nova-rdp.xml b/doc/common/tables/nova-rdp.xml index b58fe1ff6e..d7a187287a 100644 --- a/doc/common/tables/nova-rdp.xml +++ b/doc/common/tables/nova-rdp.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> - +
diff --git a/doc/common/tables/nova-redis.xml b/doc/common/tables/nova-redis.xml index 02dfe9ac0c..83488d3a46 100644 --- a/doc/common/tables/nova-redis.xml +++ b/doc/common/tables/nova-redis.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for rdp
+
@@ -20,7 +20,7 @@ - + diff --git a/doc/common/tables/nova-rpc.xml b/doc/common/tables/nova-rpc.xml index df4bca0683..2beecc2e6e 100644 --- a/doc/common/tables/nova-rpc.xml +++ b/doc/common/tables/nova-rpc.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for redis
password = None(StrOpt) Password for Redis server. (optional)(StrOpt) Password for Redis server (optional).
[remote_debug]
+
@@ -32,7 +32,7 @@ - + @@ -48,15 +48,15 @@ - + - + - + @@ -70,7 +70,7 @@ - + diff --git a/doc/common/tables/nova-rpc_all.xml b/doc/common/tables/nova-rpc_all.xml new file mode 100644 index 0000000000..71afcbc003 --- /dev/null +++ b/doc/common/tables/nova-rpc_all.xml @@ -0,0 +1,220 @@ + + + +
Description of configuration options for rpc
matchmaker_heartbeat_freq = 300(IntOpt) Heartbeat frequency(IntOpt) Heartbeat frequency.
matchmaker_heartbeat_ttl = 600
rpc_conn_pool_size = 30(IntOpt) Size of RPC connection pool(IntOpt) Size of RPC connection pool.
rpc_response_timeout = 60(IntOpt) Seconds to wait for a response from a call(IntOpt) Seconds to wait for a response from a call.
rpc_thread_pool_size = 64(IntOpt) Size of RPC greenthread pool(IntOpt) Size of RPC greenthread pool.
[cells]
ringfile = /etc/oslo/matchmaker_ring.json(StrOpt) Matchmaker ring file (JSON)(StrOpt) Matchmaker ring file (JSON).
[upgrade_levels]
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Description of configuration options for rpc_all
Configuration option = Default valueDescription
[DEFAULT]
amqp_auto_delete = False(BoolOpt) Auto-delete queues in amqp.
amqp_durable_queues = False(BoolOpt) Use durable queues in amqp.
control_exchange = openstack(StrOpt) The default exchange under which topics are scoped. May be overridden by an exchange name specified in the transport_url option.
kombu_reconnect_delay = 1.0(FloatOpt) How long to wait before reconnecting in response to an AMQP consumer cancel notification.
kombu_ssl_ca_certs = (StrOpt) SSL certification authority file (valid only if SSL enabled).
kombu_ssl_certfile = (StrOpt) SSL cert file (valid only if SSL enabled).
kombu_ssl_keyfile = (StrOpt) SSL key file (valid only if SSL enabled).
kombu_ssl_version = (StrOpt) SSL version to use (valid only if SSL enabled). valid values are TLSv1, SSLv23 and SSLv3. SSLv2 may be available on some distributions.
matchmaker_heartbeat_freq = 300(IntOpt) Heartbeat frequency.
matchmaker_heartbeat_ttl = 600(IntOpt) Heartbeat time-to-live.
qpid_heartbeat = 60(IntOpt) Seconds between connection keepalive heartbeats.
qpid_hostname = oslo(StrOpt) Qpid broker hostname.
qpid_hosts = $qpid_hostname:$qpid_port(ListOpt) Qpid HA cluster host:port pairs.
qpid_password = (StrOpt) Password for Qpid connection.
qpid_port = 5672(IntOpt) Qpid broker port.
qpid_protocol = tcp(StrOpt) Transport to use, either 'tcp' or 'ssl'.
qpid_sasl_mechanisms = (StrOpt) Space separated list of SASL mechanisms to use for auth.
qpid_tcp_nodelay = True(BoolOpt) Whether to disable the Nagle algorithm.
qpid_topology_version = 1(IntOpt) The qpid topology version to use. Version 1 is what was originally used by impl_qpid. Version 2 includes some backwards-incompatible changes that allow broker federation to work. Users should update to version 2 when they are able to take everything down, as it requires a clean break.
qpid_username = (StrOpt) Username for Qpid connection.
rabbit_ha_queues = False(BoolOpt) Use HA queues in RabbitMQ (x-ha-policy: all). If you change this option, you must wipe the RabbitMQ database.
rabbit_host = oslo(StrOpt) The RabbitMQ broker address where a single node is used.
rabbit_hosts = $rabbit_host:$rabbit_port(ListOpt) RabbitMQ HA cluster host:port pairs.
rabbit_login_method = AMQPLAIN(StrOpt) the RabbitMQ login method
rabbit_max_retries = 0(IntOpt) Maximum number of RabbitMQ connection retries. Default is 0 (infinite retry count).
rabbit_password = guest(StrOpt) The RabbitMQ password.
rabbit_port = 5672(IntOpt) The RabbitMQ broker port where a single node is used.
rabbit_retry_backoff = 2(IntOpt) How long to backoff for between retries when connecting to RabbitMQ.
rabbit_retry_interval = 1(IntOpt) How frequently to retry connecting with RabbitMQ.
rabbit_use_ssl = False(BoolOpt) Connect over SSL for RabbitMQ.
rabbit_userid = guest(StrOpt) The RabbitMQ userid.
rabbit_virtual_host = /(StrOpt) The RabbitMQ virtual host.
rpc_backend = rabbit(StrOpt) The messaging driver to use, defaults to rabbit. Other drivers include qpid and zmq.
rpc_cast_timeout = 30(IntOpt) Seconds to wait before a cast expires (TTL). Only supported by impl_zmq.
rpc_conn_pool_size = 30(IntOpt) Size of RPC connection pool.
rpc_response_timeout = 60(IntOpt) Seconds to wait for a response from a call.
rpc_thread_pool_size = 64(IntOpt) Size of RPC greenthread pool.
rpc_zmq_bind_address = *(StrOpt) ZeroMQ bind address. Should be a wildcard (*), an ethernet interface, or IP. The "host" option should point or resolve to this address.
rpc_zmq_contexts = 1(IntOpt) Number of ZeroMQ contexts, defaults to 1.
rpc_zmq_host = oslo(StrOpt) Name of this node. Must be a valid hostname, FQDN, or IP address. Must match "host" option, if running Nova.
rpc_zmq_ipc_dir = /var/run/openstack(StrOpt) Directory for holding IPC sockets.
rpc_zmq_matchmaker = oslo.messaging._drivers.matchmaker.MatchMakerLocalhost(StrOpt) MatchMaker driver.
rpc_zmq_port = 9501(IntOpt) ZeroMQ receiver listening port.
rpc_zmq_topic_backlog = None(IntOpt) Maximum number of ingress messages to locally buffer per topic. Default is unlimited.
[cells]
rpc_driver_queue_base = cells.intercell(StrOpt) Base queue name to use when communicating between cells. Various topics by message type will be appended to this.
[matchmaker_ring]
ringfile = /etc/oslo/matchmaker_ring.json(StrOpt) Matchmaker ring file (JSON).
[upgrade_levels]
baseapi = None(StrOpt) Set a version cap for messages sent to the base api in any service
+ diff --git a/doc/common/tables/nova-s3.xml b/doc/common/tables/nova-s3.xml index 13efc4b1d5..b15130794b 100644 --- a/doc/common/tables/nova-s3.xml +++ b/doc/common/tables/nova-s3.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> - +
diff --git a/doc/common/tables/nova-scheduling.xml b/doc/common/tables/nova-scheduling.xml index 9688b7eefe..25f8c27034 100644 --- a/doc/common/tables/nova-scheduling.xml +++ b/doc/common/tables/nova-scheduling.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for s3
+
diff --git a/doc/common/tables/nova-spice.xml b/doc/common/tables/nova-spice.xml index 21314528af..df5f9261b8 100644 --- a/doc/common/tables/nova-spice.xml +++ b/doc/common/tables/nova-spice.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for scheduling
+
diff --git a/doc/common/tables/nova-testing.xml b/doc/common/tables/nova-testing.xml index 3a2d23f012..6bf08c684b 100644 --- a/doc/common/tables/nova-testing.xml +++ b/doc/common/tables/nova-testing.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for spice
+
@@ -20,7 +20,7 @@ - + @@ -36,7 +36,7 @@ - + diff --git a/doc/common/tables/nova-tilera.xml b/doc/common/tables/nova-tilera.xml index 43c8e9b194..8ef8e27cf5 100644 --- a/doc/common/tables/nova-tilera.xml +++ b/doc/common/tables/nova-tilera.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for testing
allowed_rpc_exception_modules = oslo.messaging.exceptions, nova.exception, cinder.exception, exceptions(ListOpt) Modules of exceptions that are permitted to be recreatedupon receiving exception data from an rpc call.(ListOpt) Modules of exceptions that are permitted to be recreated upon receiving exception data from an rpc call.
backdoor_port = None
fake_rabbit = False(BoolOpt) If passed, use a fake RabbitMQ provider(BoolOpt) If passed, use a fake RabbitMQ provider.
monkey_patch = False
+
diff --git a/doc/common/tables/nova-trustedcomputing.xml b/doc/common/tables/nova-trustedcomputing.xml index a78596c310..a2e158236c 100644 --- a/doc/common/tables/nova-trustedcomputing.xml +++ b/doc/common/tables/nova-trustedcomputing.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for tilera
+
diff --git a/doc/common/tables/nova-upgrade_levels.xml b/doc/common/tables/nova-upgrade_levels.xml index 7c1f037961..3c6d8b5df2 100644 --- a/doc/common/tables/nova-upgrade_levels.xml +++ b/doc/common/tables/nova-upgrade_levels.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for trustedcomputing
+
diff --git a/doc/common/tables/nova-vmware.xml b/doc/common/tables/nova-vmware.xml index 28249e6c17..920260ca87 100644 --- a/doc/common/tables/nova-vmware.xml +++ b/doc/common/tables/nova-vmware.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for upgrade_levels
+
@@ -32,7 +32,7 @@ - + diff --git a/doc/common/tables/nova-vnc.xml b/doc/common/tables/nova-vnc.xml index 6b82f8a886..6c24d261b7 100644 --- a/doc/common/tables/nova-vnc.xml +++ b/doc/common/tables/nova-vnc.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for vmware
host_ip = None(StrOpt) URL for connection to VMware ESX/VC host.(StrOpt) Hostname or IP address for connection to VMware ESX/VC host.
host_password = None
+
diff --git a/doc/common/tables/nova-volumes.xml b/doc/common/tables/nova-volumes.xml index c8ce5b9de9..88f2eaadae 100644 --- a/doc/common/tables/nova-volumes.xml +++ b/doc/common/tables/nova-volumes.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for vnc
+
diff --git a/doc/common/tables/nova-vpn.xml b/doc/common/tables/nova-vpn.xml index 8bf7de417c..8555743798 100644 --- a/doc/common/tables/nova-vpn.xml +++ b/doc/common/tables/nova-vpn.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for volumes
+
diff --git a/doc/common/tables/nova-wsgi.xml b/doc/common/tables/nova-wsgi.xml index fd5b3d6cb2..8627ee254b 100644 --- a/doc/common/tables/nova-wsgi.xml +++ b/doc/common/tables/nova-wsgi.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for vpn
+
diff --git a/doc/common/tables/nova-xen.xml b/doc/common/tables/nova-xen.xml index d5d4532dbd..c60c890f6d 100644 --- a/doc/common/tables/nova-xen.xml +++ b/doc/common/tables/nova-xen.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for wsgi
+
@@ -122,7 +122,7 @@ - + diff --git a/doc/common/tables/nova-xvpnvncproxy.xml b/doc/common/tables/nova-xvpnvncproxy.xml index 47017c9b39..f6e6915912 100644 --- a/doc/common/tables/nova-xvpnvncproxy.xml +++ b/doc/common/tables/nova-xvpnvncproxy.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for xen
introduce_vdi_retry_wait = 20(IntOpt) Number of seconds to wait for an SR to settle if the VDI does not exist when first introduced (IntOpt) Number of seconds to wait for an SR to settle if the VDI does not exist when first introduced
ipxe_boot_menu_url = None
+
diff --git a/doc/common/tables/nova-zeromq.xml b/doc/common/tables/nova-zeromq.xml index 9638aad1f5..94e818666d 100644 --- a/doc/common/tables/nova-zeromq.xml +++ b/doc/common/tables/nova-zeromq.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for xvpnvncproxy
+
@@ -24,7 +24,7 @@ - + @@ -32,15 +32,15 @@ - + - + - + diff --git a/doc/common/tables/nova-zookeeper.xml b/doc/common/tables/nova-zookeeper.xml index c71889cd2d..a22d3ba5fd 100644 --- a/doc/common/tables/nova-zookeeper.xml +++ b/doc/common/tables/nova-zookeeper.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for zeromq
rpc_zmq_contexts = 1(IntOpt) Number of ZeroMQ contexts, defaults to 1(IntOpt) Number of ZeroMQ contexts, defaults to 1.
rpc_zmq_host = oslo
rpc_zmq_ipc_dir = /var/run/openstack(StrOpt) Directory for holding IPC sockets(StrOpt) Directory for holding IPC sockets.
rpc_zmq_matchmaker = oslo.messaging._drivers.matchmaker.MatchMakerLocalhost(StrOpt) MatchMaker driver(StrOpt) MatchMaker driver.
rpc_zmq_port = 9501(IntOpt) ZeroMQ receiver listening port(IntOpt) ZeroMQ receiver listening port.
rpc_zmq_topic_backlog = None
+
diff --git a/doc/config-reference/ch_computeconfigure.xml b/doc/config-reference/ch_computeconfigure.xml index 3b1877df9e..e818a9cd88 100644 --- a/doc/config-reference/ch_computeconfigure.xml +++ b/doc/config-reference/ch_computeconfigure.xml @@ -33,9 +33,9 @@ You can use nova.conf file to configure where Compute logs events, the level of logging, and log formats. - To customize log formats for OpenStack Compute, use these - configuration option settings. - + To customize log formats for OpenStack Compute, use the + configuration option settings documented in + .
Configure authentication and authorization @@ -43,17 +43,15 @@ OpenStack Compute project, including no authentication. The preferred system is the OpenStack Identity Service, code-named Keystone. - To customize authorization settings for Compute, see these - configuration settings in nova.conf. - - To customize certificate authority settings for Compute, see - these configuration settings in - nova.conf. - - To customize Compute and the Identity service to use LDAP as - a backend, refer to these configuration settings in - nova.conf. - + To customize authorization settings for Compute, use the + configuration options documented in + . + To customize certificate authority settings for Compute, use the + configuration options documented in . + To customize Compute and the Identity service to use LDAP as a + backend, refer to the configuration options documented in .
diff --git a/doc/config-reference/ch_imageservice.xml b/doc/config-reference/ch_imageservice.xml index 7bf589341c..db8f63390e 100644 --- a/doc/config-reference/ch_imageservice.xml +++ b/doc/config-reference/ch_imageservice.xml @@ -14,13 +14,16 @@ (Glance), which is currently the only supported image service. - If your installation requires euca2ools to register new images, you must run the nova-objectstore service. This service provides an Amazon S3 front-end for Glance, which is required by euca2ools. - + + To customize the Compute Service, use the configuration option + settings documented in and + . + You can modify many options in the OpenStack Image Service. The following tables provide a comprehensive list. diff --git a/doc/config-reference/compute/section_compute-cells.xml b/doc/config-reference/compute/section_compute-cells.xml index ee7b2f0645..79c45c38df 100644 --- a/doc/config-reference/compute/section_compute-cells.xml +++ b/doc/config-reference/compute/section_compute-cells.xml @@ -170,7 +170,9 @@ rabbit_virtual_host=cell1_vhost In the child cell, we would run the following, as root:# nova-manage cell create --name=api --cell_type=parent --username=api1_user --password=api1_passwd --hostname=10.0.0.10 --port=5672 --virtual_host=api_vhost --woffset=1.0 --wscale=1.0 - + To customize the Compute cells, use the configuration option + settings documented in .
Cell scheduling configuration diff --git a/doc/config-reference/compute/section_compute-conductor.xml b/doc/config-reference/compute/section_compute-conductor.xml index f041dd2cce..19f6de9a3e 100644 --- a/doc/config-reference/compute/section_compute-conductor.xml +++ b/doc/config-reference/compute/section_compute-conductor.xml @@ -37,6 +37,7 @@ progress and graceful error handling. This will be especially beneficial for operations that cross multiple compute nodes, such as migrations or resizes. - +To customize the Conductor, use the configuration option settings + documented in .
diff --git a/doc/config-reference/compute/section_compute-configure-db.xml b/doc/config-reference/compute/section_compute-configure-db.xml index 1d27526ab0..3e0061025d 100644 --- a/doc/config-reference/compute/section_compute-configure-db.xml +++ b/doc/config-reference/compute/section_compute-configure-db.xml @@ -21,7 +21,7 @@ nova-scheduler service, although all services must be able to update entries in the database. - In either case, use these settings to configure the connection + In either case, use the configuration option settings documented in + to configure the connection string for the nova database. - diff --git a/doc/config-reference/compute/section_compute-configure-service-groups.xml b/doc/config-reference/compute/section_compute-configure-service-groups.xml index 6e46d6ecc0..8b6ed07423 100644 --- a/doc/config-reference/compute/section_compute-configure-service-groups.xml +++ b/doc/config-reference/compute/section_compute-configure-service-groups.xml @@ -79,6 +79,8 @@ [zookeeper] address="192.168.2.1:2181,192.168.2.2:2181,192.168.2.3:2181" - + To customize the Compute Service groups, use the configuration option + settings documented in . diff --git a/doc/config-reference/compute/section_compute-configure-xen.xml b/doc/config-reference/compute/section_compute-configure-xen.xml index a169970f49..efbd710fa2 100644 --- a/doc/config-reference/compute/section_compute-configure-xen.xml +++ b/doc/config-reference/compute/section_compute-configure-xen.xml @@ -73,6 +73,7 @@ by using the Host Aggregates feature.
Xen configuration reference - +To customize the Xen driver, use the configuration option settings + documented in .
diff --git a/doc/config-reference/compute/section_compute-hypervisors.xml b/doc/config-reference/compute/section_compute-hypervisors.xml index 2a2ba9ac85..d6f033abc8 100644 --- a/doc/config-reference/compute/section_compute-hypervisors.xml +++ b/doc/config-reference/compute/section_compute-hypervisors.xml @@ -77,14 +77,6 @@ hardware through pluggable sub-drivers (for example, PXE for image deployment, and IPMI for power management). - - Dockeris an open-source engine which automates the deployment of - >applications as highly portable, self-sufficient containers which are - >independent of hardware, language, framework, packaging system and hosting - >provider. -
Hypervisor configuration basics @@ -100,9 +92,9 @@ service. Here are the general nova.conf options that are used to configure the compute node's - hypervisor. Specific options for particular hypervisors + hypervisor: . + Specific options for particular hypervisors can be found in following sections. -
@@ -111,5 +103,4 @@ - diff --git a/doc/config-reference/compute/section_compute-options-reference.xml b/doc/config-reference/compute/section_compute-options-reference.xml index 8cd85b773f..b73a7b61ad 100644 --- a/doc/config-reference/compute/section_compute-options-reference.xml +++ b/doc/config-reference/compute/section_compute-options-reference.xml @@ -27,7 +27,6 @@ - @@ -38,12 +37,10 @@ - - - + @@ -57,7 +54,6 @@ - diff --git a/doc/config-reference/compute/section_compute-scheduler.xml b/doc/config-reference/compute/section_compute-scheduler.xml index e60f0b8569..631dab2329 100644 --- a/doc/config-reference/compute/section_compute-scheduler.xml +++ b/doc/config-reference/compute/section_compute-scheduler.xml @@ -518,6 +518,8 @@ ram_weight_multiplier=1.0 href="../../common/section_cli_nova_host_aggregates.xml"/>
Configuration reference - + To customize the Compute scheduler, use the configuration option + settings documented in .
diff --git a/doc/config-reference/compute/section_hypervisor_baremetal.xml b/doc/config-reference/compute/section_hypervisor_baremetal.xml index b89810028d..1f65290591 100644 --- a/doc/config-reference/compute/section_hypervisor_baremetal.xml +++ b/doc/config-reference/compute/section_hypervisor_baremetal.xml @@ -37,5 +37,7 @@ reserved_host_memory_mb=0 the main wiki page for details and implementation suggestions. - + To customize the Baremetal driver, use the configuration option + settings documented in . diff --git a/doc/config-reference/compute/section_hypervisor_docker.xml b/doc/config-reference/compute/section_hypervisor_docker.xml deleted file mode 100644 index af0dd6faaf..0000000000 --- a/doc/config-reference/compute/section_hypervisor_docker.xml +++ /dev/null @@ -1,45 +0,0 @@ - -
- Docker driver - The Docker driver is a hypervisor driver for OpenStack Compute, introduced with the Havana - release. Docker is an open-source engine which automates the deployment of applications as - highly portable, self-sufficient containers which are independent of hardware, language, - framework, packaging system, and hosting provider. - Docker extends LXC with a high level API providing a lightweight virtualization solution - that runs processes in isolation. It provides a way to automate software deployment in a - secure and repeatable environment. A standard container in Docker contains a software - component along with all of its dependencies - binaries, libraries, configuration files, - scripts, virtualenvs, jars, gems, and tarballs. - Docker can be run on any x86_64 Linux kernel that supports cgroups and aufs. Docker is a - way of managing LXC containers on a single machine. However used behind OpenStack Compute - makes Docker much more powerful since it is then possible to manage several hosts which will - then manage hundreds of containers. The current Docker project aims for full OpenStack - compatibility. Containers do not aim to be a replacement for VMs; they are just complementary - in the sense that they are better for specific use cases. Compute's support for VMs is - currently advanced thanks to the variety of hypervisors running VMs. However it is not the - case for containers even though libvirt/LXC is a good starting point. Docker aims to go the - second level of integration. - - Some OpenStack Compute features are not implemented by - the docker driver. See the - hypervisor support matrix for details. - - - - The Docker driver only supports Linux Bridge networking - at this time. - - - To enable Docker, ensure the following options are set in - /etc/nova/nova-compute.conf on all hosts running the - nova-compute service. - compute_driver=docker.DockerDriver - The Image Service also needs to be configured to support the Docker container format, in - /etc/glance/glance-api.conf: - container_formats = ami,ari,aki,bare,ovf,docker - -
diff --git a/doc/config-reference/compute/section_hypervisor_hyper-v.xml b/doc/config-reference/compute/section_hypervisor_hyper-v.xml index c29324bb35..d75eab6075 100644 --- a/doc/config-reference/compute/section_hypervisor_hyper-v.xml +++ b/doc/config-reference/compute/section_hypervisor_hyper-v.xml @@ -348,8 +348,8 @@ compute_driver=nova.virt.hyperv.driver.HyperVDriver volume_api_class=nova.volume.cinder.API [database] connection=mysql://nova:passwd@IP_ADDRESS/nova - The following table contains a reference of all options for hyper-v - + contains a reference of all + options for hyper-v.
Prepare images for use with Hyper-V diff --git a/doc/config-reference/compute/section_hypervisor_vmware.xml b/doc/config-reference/compute/section_hypervisor_vmware.xml index 890d09a142..96c3c21ba5 100644 --- a/doc/config-reference/compute/section_hypervisor_vmware.xml +++ b/doc/config-reference/compute/section_hypervisor_vmware.xml @@ -689,6 +689,7 @@ wsdl_location=http://127.0.0.1:8080/vmware/SDK/wsdl/vim25/vimService.wsdl
Configuration reference - + To customize the VMware driver, use the configuration option settings + documented in .
diff --git a/doc/config-reference/compute/section_nova-conf.xml b/doc/config-reference/compute/section_nova-conf.xml index f5cb811f22..89ad8eacd7 100644 --- a/doc/config-reference/compute/section_nova-conf.xml +++ b/doc/config-reference/compute/section_nova-conf.xml @@ -27,9 +27,8 @@ server=10.3.4.2 (#) character. For a list of configuration options, see the tables in this guide. To learn more about the nova.conf - configuration file, review these general purpose configuration - options. - + configuration file, review the general purpose configuration + options documented in . Types of configuration options Each configuration option has an associated data type. diff --git a/tools/autogenerate-config-flagmappings/nova.flagmappings b/tools/autogenerate-config-flagmappings/nova.flagmappings index 16b660c4b9..e9142ffea6 100644 --- a/tools/autogenerate-config-flagmappings/nova.flagmappings +++ b/tools/autogenerate-config-flagmappings/nova.flagmappings @@ -6,8 +6,8 @@ allow_resize_to_same_host policy allow_same_net_traffic network allowed_direct_url_schemes glance allowed_rpc_exception_modules testing -amqp_auto_delete rpc -amqp_durable_queues rpc +amqp_auto_delete rpc rpc_all +amqp_durable_queues rpc rpc_all api_paste_config wsgi api_rate_limit authentication auth_strategy authentication @@ -52,7 +52,7 @@ console_xvp_multiplex_port xen console_xvp_pid xen consoleauth_manager console consoleauth_topic common -control_exchange rpc +control_exchange rpc rpc_all cpu_allocation_ratio scheduling create_unique_mac_address_attempts network crl_file ca @@ -128,6 +128,7 @@ host common image_cache_manager_interval compute image_cache_subdirectory_name compute image_decryption_dir s3 +image_handlers compute injected_network_template network instance_build_timeout compute instance_delete_interval compute @@ -149,10 +150,11 @@ isolated_images scheduling key_file ca keys_path ca keystone_ec2_url ec2 -kombu_ssl_ca_certs kombu -kombu_ssl_certfile kombu -kombu_ssl_keyfile kombu -kombu_ssl_version kombu +kombu_reconnect_delay kombu rpc_all +kombu_ssl_ca_certs kombu rpc_all +kombu_ssl_certfile kombu rpc_all +kombu_ssl_keyfile kombu rpc_all +kombu_ssl_version kombu rpc_all l3_lib network ldap_dns_base_dn ldap ldap_dns_password ldap @@ -171,17 +173,17 @@ lock_path common lockout_attempts ec2 lockout_minutes ec2 lockout_window ec2 -log-config-append logging -log-date-format logging -log-dir logging -log-file logging -log-format logging +log_config_append logging +log_date_format logging +log_dir logging +log_file logging +log_format logging logging_context_format_string logging logging_debug_format_suffix logging logging_default_format_string logging logging_exception_prefix logging -matchmaker_heartbeat_freq rpc -matchmaker_heartbeat_ttl rpc +matchmaker_heartbeat_freq rpc rpc_all +matchmaker_heartbeat_ttl rpc rpc_all max_age policy max_header_line api max_instances_per_host scheduling @@ -260,16 +262,16 @@ project_cert_subject ca public_interface network publish_errors logging pybasedir common -qpid_heartbeat qpid -qpid_hostname qpid -qpid_hosts qpid -qpid_password qpid -qpid_port qpid -qpid_protocol qpid -qpid_sasl_mechanisms qpid -qpid_tcp_nodelay qpid -qpid_topology_version qpid -qpid_username qpid +qpid_heartbeat qpid rpc_all +qpid_hostname qpid rpc_all +qpid_hosts qpid rpc_all +qpid_password qpid rpc_all +qpid_port qpid rpc_all +qpid_protocol qpid rpc_all +qpid_sasl_mechanisms qpid rpc_all +qpid_tcp_nodelay qpid rpc_all +qpid_topology_version qpid rpc_all +qpid_username qpid rpc_all quota_cores quota quota_driver quota quota_fixed_ips quota @@ -283,17 +285,18 @@ quota_metadata_items quota quota_ram quota quota_security_group_rules quota quota_security_groups quota -rabbit_ha_queues rabbitmq -rabbit_host rabbitmq -rabbit_hosts rabbitmq -rabbit_max_retries rabbitmq -rabbit_password rabbitmq -rabbit_port rabbitmq -rabbit_retry_backoff rabbitmq -rabbit_retry_interval rabbitmq -rabbit_use_ssl rabbitmq -rabbit_userid rabbitmq -rabbit_virtual_host rabbitmq +rabbit_ha_queues rabbitmq rpc_all +rabbit_host rabbitmq rpc_all +rabbit_hosts rabbitmq rpc_all +rabbit_login_method rabbitmq rpc_all +rabbit_max_retries rabbitmq rpc_all +rabbit_password rabbitmq rpc_all +rabbit_port rabbitmq rpc_all +rabbit_retry_backoff rabbitmq rpc_all +rabbit_retry_interval rabbitmq rpc_all +rabbit_use_ssl rabbitmq rpc_all +rabbit_userid rabbitmq rpc_all +rabbit_virtual_host rabbitmq rpc_all ram_allocation_ratio scheduling ram_weight_multiplier scheduling reboot_timeout compute @@ -312,18 +315,18 @@ restrict_isolated_hosts_to_isolated_images scheduling resume_guests_state_on_host_boot compute rootwrap_config common routing_source_ip network -rpc_backend rpc -rpc_cast_timeout rpc -rpc_conn_pool_size rpc -rpc_response_timeout rpc -rpc_thread_pool_size rpc -rpc_zmq_bind_address zeromq -rpc_zmq_contexts zeromq -rpc_zmq_host zeromq -rpc_zmq_ipc_dir zeromq -rpc_zmq_matchmaker zeromq -rpc_zmq_port zeromq -rpc_zmq_topic_backlog zeromq +rpc_backend rpc rpc_all +rpc_cast_timeout rpc rpc_all +rpc_conn_pool_size rpc rpc_all +rpc_response_timeout rpc rpc_all +rpc_thread_pool_size rpc rpc_all +rpc_zmq_bind_address zeromq rpc_all +rpc_zmq_contexts zeromq rpc_all +rpc_zmq_host zeromq rpc_all +rpc_zmq_ipc_dir zeromq rpc_all +rpc_zmq_matchmaker zeromq rpc_all +rpc_zmq_port zeromq rpc_all +rpc_zmq_topic_backlog zeromq rpc_all run_external_periodic_tasks periodic running_deleted_instance_action compute running_deleted_instance_poll_interval compute @@ -357,15 +360,13 @@ share_dhcp_address network shelved_offload_time compute shelved_poll_interval compute snapshot_name_template api -sqlite_db db -sqlite_synchronous db ssl_ca_file wsgi ssl_cert_file wsgi ssl_key_file wsgi state_path common stub_compute xen sync_power_state_interval compute -syslog-log-facility logging +syslog_log_facility logging tcp_keepidle wsgi teardown_unused_network_gateway network tempdir common @@ -373,8 +374,6 @@ timeout_nbd hypervisor transport_url common until_refresh policy update_dns_entries network -use-syslog logging -use-syslog-rfc-format logging use_cow_images hypervisor use_forwarded_for api use_ipv6 ipv6 @@ -383,11 +382,15 @@ use_neutron_default_nets network use_project_ca ca use_single_default_gateway network use_stderr logging +use_syslog logging +use_syslog_rfc_format logging user_cert_subject ca vcpu_pin_set hypervisor vendordata_driver metadata vendordata_jsonfile_path metadata verbose logging +vif_plugging_is_fatal compute +vif_plugging_timeout compute virt_mkfs hypervisor vlan_interface network vlan_start network @@ -461,7 +464,7 @@ cells/name cells cells/offset_weight_multiplier cells cells/ram_weight_multiplier scheduling cells/reserve_percent cells -cells/rpc_driver_queue_base rpc +cells/rpc_driver_queue_base rpc rpc_all cells/scheduler upgrade_levels cells/scheduler_filter_classes scheduling cells/scheduler_retries scheduling @@ -476,16 +479,22 @@ database/backend db database/connection db database/connection_debug db database/connection_trace db +database/db_inc_retry_interval db +database/db_max_retries db +database/db_max_retry_interval db +database/db_retry_interval db database/idle_timeout db database/max_overflow db database/max_pool_size db database/max_retries db database/min_pool_size db +database/mysql_sql_mode db database/pool_timeout db database/retry_interval db database/slave_connection db -database/use_tpool api -docker/registry_default_port docker +database/sqlite_db db +database/sqlite_synchronous db +database/use_db_reconnect db hyperv/config_drive_cdrom configdrive hyperv/config_drive_inject_password configdrive hyperv/dynamic_memory_ratio hyperv @@ -554,7 +563,7 @@ libvirt/volume_clear_size libvirt libvirt/volume_drivers libvirt libvirt/wait_soft_reboot_seconds libvirt libvirt/xen_hvmloader_path xen -matchmaker_ring/ringfile rpc +matchmaker_ring/ringfile rpc rpc_all metrics/required scheduling metrics/weight_multiplier scheduling metrics/weight_of_unavailable scheduling @@ -581,7 +590,7 @@ trusted_computing/attestation_auth_timeout trustedcomputing trusted_computing/attestation_port trustedcomputing trusted_computing/attestation_server trustedcomputing trusted_computing/attestation_server_ca_file trustedcomputing -upgrade_levels/baseapi rpc +upgrade_levels/baseapi rpc rpc_all upgrade_levels/cells upgrade_levels upgrade_levels/cert upgrade_levels upgrade_levels/compute upgrade_levels
Description of configuration options for zookeeper