config-ref: nova tables update

Change-Id: I111c2b512689e5b30fb985d3cd34195cf14af280

doc/common/tables/nova-amqp.xml

@@ -17,14 +17,6 @@
       <tr>
         <th colspan="2">[DEFAULT]</th>
       </tr>
-      <tr>
-        <td><option>amqp_auto_delete</option> = <replaceable>False</replaceable></td>
-        <td>(BoolOpt) Auto-delete queues in AMQP.</td>
-      </tr>
-      <tr>
-        <td><option>amqp_durable_queues</option> = <replaceable>False</replaceable></td>
-        <td>(BoolOpt) Use durable queues in AMQP.</td>
-      </tr>
       <tr>
         <td><option>control_exchange</option> = <replaceable>openstack</replaceable></td>
         <td>(StrOpt) The default exchange under which topics are scoped. May be overridden by an exchange name specified in the transport_url option.</td>

doc/common/tables/nova-auth_token.xml

@@ -119,7 +119,7 @@
       </tr>
       <tr>
         <td><option>memcache_pool_conn_get_timeout</option> = <replaceable>10</replaceable></td>
-        <td>(IntOpt) (Optional) Number of seconds that an operation will wait to get a memcache client connection from the pool.</td>
+        <td>(IntOpt) (Optional) Number of seconds that an operation will wait to get a memcached client connection from the pool.</td>
       </tr>
       <tr>
         <td><option>memcache_pool_dead_retry</option> = <replaceable>300</replaceable></td>
@@ -131,7 +131,7 @@
       </tr>
       <tr>
         <td><option>memcache_pool_socket_timeout</option> = <replaceable>3</replaceable></td>
-        <td>(IntOpt) (Optional) Socket timeout in seconds for communicating with a memcache server.</td>
+        <td>(IntOpt) (Optional) Socket timeout in seconds for communicating with a memcached server.</td>
       </tr>
       <tr>
         <td><option>memcache_pool_unused_timeout</option> = <replaceable>60</replaceable></td>
@@ -147,7 +147,7 @@
       </tr>
       <tr>
         <td><option>memcache_use_advanced_pool</option> = <replaceable>False</replaceable></td>
-        <td>(BoolOpt) (Optional) Use the advanced (eventlet safe) memcache client pool. The advanced pool will only work under python 2.x.</td>
+        <td>(BoolOpt) (Optional) Use the advanced (eventlet safe) memcached client pool. The advanced pool will only work under python 2.x.</td>
       </tr>
       <tr>
         <td><option>revocation_cache_time</option> = <replaceable>10</replaceable></td>

doc/common/tables/nova-authentication.xml

@@ -19,7 +19,11 @@
       </tr>
       <tr>
         <td><option>auth_strategy</option> = <replaceable>keystone</replaceable></td>
-        <td>(StrOpt) The strategy to use for auth: noauth or keystone.</td>
+        <td>(StrOpt) The strategy to use for auth: keystone, noauth (deprecated), or
+noauth2. Both noauth and noauth2 are designed for testing only, as
+they do no actual credential checking. noauth provides administrative
+credentials regardless of the passed in user, noauth2 only does if
+'admin' is specified as the username.</td>
       </tr>
     </tbody>
   </table>

doc/common/tables/nova-cells.xml

@@ -66,12 +66,12 @@
         <td>(IntOpt) Number of seconds after which a lack of capability and capacity updates signals the child cell is to be treated as a mute.</td>
       </tr>
       <tr>
-        <td><option>mute_weight_multiplier</option> = <replaceable>-10.0</replaceable></td>
+        <td><option>mute_weight_multiplier</option> = <replaceable>-10000.0</replaceable></td>
         <td>(FloatOpt) Multiplier used to weigh mute children. (The value should be negative.)</td>
       </tr>
       <tr>
-        <td><option>mute_weight_value</option> = <replaceable>1000.0</replaceable></td>
+        <td><option>mute_weight_value</option> = <replaceable>None</replaceable></td>
-        <td>(FloatOpt) Weight value assigned to mute children. (The value should be positive.)</td>
+        <td>(FloatOpt) DEPRECATED: this option has no effect anymore. Please use "mute_weight_multiplier" instead. This option is deprecated in the 2015.1 release and will be removed in the 2015.2 release.</td>
       </tr>
       <tr>
         <td><option>name</option> = <replaceable>nova</replaceable></td>

doc/common/tables/nova-common.xml

@@ -77,6 +77,10 @@
         <td><option>tempdir</option> = <replaceable>None</replaceable></td>
         <td>(StrOpt) Explicitly specify the temporary working directory</td>
       </tr>
+      <tr>
+        <td><option>update_resources_interval</option> = <replaceable>0</replaceable></td>
+        <td>(IntOpt) Interval in seconds for updating compute resources. A number less than 0 means to disable the task completely. Leaving this at the default of 0 will cause this to run at the default periodic interval. Setting it to any positive value will cause it to run at approximately that number of seconds.</td>
+      </tr>
       <tr>
         <th colspan="2">[keystone_authtoken]</th>
       </tr>
@@ -87,6 +91,10 @@
       <tr>
         <th colspan="2">[workarounds]</th>
       </tr>
+      <tr>
+        <td><option>destroy_after_evacuate</option> = <replaceable>True</replaceable></td>
+        <td>(BoolOpt) Whether to destroy instances on startup when we suspect they have previously been evacuated. This can result in data loss if undesired. See https://launchpad.net/bugs/1419785</td>
+      </tr>
       <tr>
         <td><option>disable_libvirt_livesnapshot</option> = <replaceable>True</replaceable></td>
         <td>(BoolOpt) When using libvirt 1.2.2 fails live snapshots intermittently under load.  This config option provides mechanism to disable livesnapshot while this is resolved.  See https://bugs.launchpad.net/nova/+bug/1334398</td>

doc/common/tables/nova-compute.xml

@@ -23,7 +23,7 @@
       </tr>
       <tr>
         <td><option>compute_driver</option> = <replaceable>None</replaceable></td>
-        <td>(StrOpt) Driver to use for controlling virtualization. Options include: libvirt.LibvirtDriver, xenapi.XenAPIDriver, fake.FakeDriver, baremetal.BareMetalDriver, vmwareapi.VMwareVCDriver, hyperv.HyperVDriver</td>
+        <td>(StrOpt) Driver to use for controlling virtualization. Options include: libvirt.LibvirtDriver, xenapi.XenAPIDriver, fake.FakeDriver, ironic.IronicDriver, vmwareapi.VMwareVCDriver, hyperv.HyperVDriver</td>
       </tr>
       <tr>
         <td><option>compute_manager</option> = <replaceable>nova.compute.manager.ComputeManager</replaceable></td>
@@ -63,7 +63,7 @@
       </tr>
       <tr>
         <td><option>heal_instance_info_cache_interval</option> = <replaceable>60</replaceable></td>
-        <td>(IntOpt) Number of seconds between instance info_cache self healing updates</td>
+        <td>(IntOpt) Number of seconds between instance network information cache updates</td>
       </tr>
       <tr>
         <td><option>image_cache_manager_interval</option> = <replaceable>2400</replaceable></td>

doc/common/tables/nova-configdrive.xml

@@ -27,7 +27,7 @@
       </tr>
       <tr>
         <td><option>force_config_drive</option> = <replaceable>None</replaceable></td>
-        <td>(StrOpt) Set to force injection to take place on a config drive (if set, valid options are: always)</td>
+        <td>(StrOpt) Set to "always" to force injection to take place on a config drive. NOTE: The "always" will be deprecated in the Liberty release cycle.</td>
       </tr>
       <tr>
         <td><option>mkisofs_cmd</option> = <replaceable>genisoimage</replaceable></td>

doc/common/tables/nova-database.xml

@@ -21,6 +21,57 @@
         <td><option>db_driver</option> = <replaceable>nova.db</replaceable></td>
         <td>(StrOpt) The driver to use for database access</td>
       </tr>
+      <tr>
+        <th colspan="2">[api_database]</th>
+      </tr>
+      <tr>
+        <td><option>connection</option> = <replaceable>None</replaceable></td>
+        <td>(StrOpt) The SQLAlchemy connection string to use to connect to the Nova API database.</td>
+      </tr>
+      <tr>
+        <td><option>connection_debug</option> = <replaceable>0</replaceable></td>
+        <td>(IntOpt) Verbosity of SQL debugging information: 0=None, 100=Everything.</td>
+      </tr>
+      <tr>
+        <td><option>connection_trace</option> = <replaceable>False</replaceable></td>
+        <td>(BoolOpt) Add Python stack traces to SQL as comment strings.</td>
+      </tr>
+      <tr>
+        <td><option>idle_timeout</option> = <replaceable>3600</replaceable></td>
+        <td>(IntOpt) Timeout before idle SQL connections are reaped.</td>
+      </tr>
+      <tr>
+        <td><option>max_overflow</option> = <replaceable>None</replaceable></td>
+        <td>(IntOpt) If set, use this value for max_overflow with SQLAlchemy.</td>
+      </tr>
+      <tr>
+        <td><option>max_pool_size</option> = <replaceable>None</replaceable></td>
+        <td>(IntOpt) Maximum number of SQL connections to keep open in a pool.</td>
+      </tr>
+      <tr>
+        <td><option>max_retries</option> = <replaceable>10</replaceable></td>
+        <td>(IntOpt) Maximum number of database connection retries during startup. Set to -1 to specify an infinite retry count.</td>
+      </tr>
+      <tr>
+        <td><option>mysql_sql_mode</option> = <replaceable>TRADITIONAL</replaceable></td>
+        <td>(StrOpt) The SQL mode to be used for MySQL sessions. This option, including the default, overrides any server-set SQL mode. To use whatever SQL mode is set by the server configuration, set this to no value. Example: mysql_sql_mode=</td>
+      </tr>
+      <tr>
+        <td><option>pool_timeout</option> = <replaceable>None</replaceable></td>
+        <td>(IntOpt) If set, use this value for pool_timeout with SQLAlchemy.</td>
+      </tr>
+      <tr>
+        <td><option>retry_interval</option> = <replaceable>10</replaceable></td>
+        <td>(IntOpt) Interval between retries of opening a SQL connection.</td>
+      </tr>
+      <tr>
+        <td><option>slave_connection</option> = <replaceable>None</replaceable></td>
+        <td>(StrOpt) The SQLAlchemy connection string to use to connect to the slave database.</td>
+      </tr>
+      <tr>
+        <td><option>sqlite_synchronous</option> = <replaceable>True</replaceable></td>
+        <td>(BoolOpt) If True, SQLite uses synchronous mode.</td>
+      </tr>
       <tr>
         <th colspan="2">[database]</th>
       </tr>
@@ -42,19 +93,19 @@
       </tr>
       <tr>
         <td><option>db_inc_retry_interval</option> = <replaceable>True</replaceable></td>
-        <td>(BoolOpt) If True, increases the interval between database connection retries up to db_max_retry_interval.</td>
+        <td>(BoolOpt) If True, increases the interval between retries of a database operation up to db_max_retry_interval.</td>
       </tr>
       <tr>
         <td><option>db_max_retries</option> = <replaceable>20</replaceable></td>
-        <td>(IntOpt) Maximum database connection retries before error is raised. Set to -1 to specify an infinite retry count.</td>
+        <td>(IntOpt) Maximum retries in case of connection error or deadlock error before error is raised. Set to -1 to specify an infinite retry count.</td>
       </tr>
       <tr>
         <td><option>db_max_retry_interval</option> = <replaceable>10</replaceable></td>
-        <td>(IntOpt) If db_inc_retry_interval is set, the maximum seconds between database connection retries.</td>
+        <td>(IntOpt) If db_inc_retry_interval is set, the maximum seconds between retries of a database operation.</td>
       </tr>
       <tr>
         <td><option>db_retry_interval</option> = <replaceable>1</replaceable></td>
-        <td>(IntOpt) Seconds between database connection retries.</td>
+        <td>(IntOpt) Seconds between retries of a database transaction.</td>
       </tr>
       <tr>
         <td><option>idle_timeout</option> = <replaceable>3600</replaceable></td>

doc/common/tables/nova-ironic.xml

@@ -55,7 +55,7 @@
       </tr>
       <tr>
         <td><option>client_log_level</option> = <replaceable>None</replaceable></td>
-        <td>(StrOpt) Log level override for ironicclient. Set this in order to override the global "default_log_levels", "verbose", and "debug" settings.</td>
+        <td>(StrOpt) Log level override for ironicclient. Set this in order to override the global "default_log_levels", "verbose", and "debug" settings. DEPRECATED: use standard logging configuration.</td>
       </tr>
     </tbody>
   </table>

doc/common/tables/nova-libvirt.xml

@@ -188,10 +188,6 @@
         <td><option>volume_clear_size</option> = <replaceable>0</replaceable></td>
         <td>(IntOpt) Size in MiB to wipe at start of old volumes. 0 =&gt; all</td>
       </tr>
-      <tr>
-        <td><option>volume_drivers</option> = <replaceable>iscsi=nova.virt.libvirt.volume.LibvirtISCSIVolumeDriver, iser=nova.virt.libvirt.volume.LibvirtISERVolumeDriver, local=nova.virt.libvirt.volume.LibvirtVolumeDriver, fake=nova.virt.libvirt.volume.LibvirtFakeVolumeDriver, rbd=nova.virt.libvirt.volume.LibvirtNetVolumeDriver, sheepdog=nova.virt.libvirt.volume.LibvirtNetVolumeDriver, nfs=nova.virt.libvirt.volume.LibvirtNFSVolumeDriver, smbfs=nova.virt.libvirt.volume.LibvirtSMBFSVolumeDriver, aoe=nova.virt.libvirt.volume.LibvirtAOEVolumeDriver, glusterfs=nova.virt.libvirt.volume.LibvirtGlusterfsVolumeDriver, fibre_channel=nova.virt.libvirt.volume.LibvirtFibreChannelVolumeDriver, scality=nova.virt.libvirt.volume.LibvirtScalityVolumeDriver, gpfs=nova.virt.libvirt.volume.LibvirtGPFSVolumeDriver, quobyte=nova.virt.libvirt.volume.LibvirtQuobyteVolumeDriver</replaceable></td>
-        <td>(ListOpt) DEPRECATED. Libvirt handlers for remote volumes. This option is deprecated and will be removed in the Kilo release.</td>
-      </tr>
       <tr>
         <td><option>wait_soft_reboot_seconds</option> = <replaceable>120</replaceable></td>
         <td>(IntOpt) Number of seconds to wait for instance to shut down after soft reboot request is made. We fall back to hard reboot if instance does not shutdown within this window.</td>

doc/common/tables/nova-logging.xml

@@ -22,7 +22,7 @@
         <td>(BoolOpt) Print debugging output (set logging level to DEBUG instead of default WARNING level).</td>
       </tr>
       <tr>
-        <td><option>default_log_levels</option> = <replaceable>amqp=WARN, amqplib=WARN, boto=WARN, qpid=WARN, sqlalchemy=WARN, suds=INFO, oslo.messaging=INFO, iso8601=WARN, requests.packages.urllib3.connectionpool=WARN, urllib3.connectionpool=WARN, websocket=WARN, keystonemiddleware=WARN, routes.middleware=WARN, stevedore=WARN</replaceable></td>
+        <td><option>default_log_levels</option> = <replaceable>amqp=WARN, amqplib=WARN, boto=WARN, qpid=WARN, sqlalchemy=WARN, suds=INFO, oslo.messaging=INFO, iso8601=WARN, requests.packages.urllib3.connectionpool=WARN, urllib3.connectionpool=WARN, websocket=WARN, requests.packages.urllib3.util.retry=WARN, urllib3.util.retry=WARN, keystonemiddleware=WARN, routes.middleware=WARN, stevedore=WARN</replaceable></td>
         <td>(ListOpt) List of logger=LEVEL pairs.</td>
       </tr>
       <tr>
@@ -61,6 +61,26 @@
         <td><option>log_format</option> = <replaceable>None</replaceable></td>
         <td>(StrOpt) DEPRECATED. A logging.Formatter log message format string which may use any of the available logging.LogRecord attributes. This option is deprecated.  Please use logging_context_format_string and logging_default_format_string instead.</td>
       </tr>
+      <tr>
+        <td><option>log_config_append</option> = <replaceable>None</replaceable></td>
+        <td>(StrOpt) The name of a logging configuration file. This file is appended to any existing logging configuration files. For details about logging configuration files, see the Python logging module documentation.</td>
+      </tr>
+      <tr>
+        <td><option>log_date_format</option> = <replaceable>%Y-%m-%d %H:%M:%S</replaceable></td>
+        <td>(StrOpt) Format string for %%(asctime)s in log records. Default: %(default)s .</td>
+      </tr>
+      <tr>
+        <td><option>log_dir</option> = <replaceable>None</replaceable></td>
+        <td>(StrOpt) (Optional) The base directory used for relative --log-file paths.</td>
+      </tr>
+      <tr>
+        <td><option>log_file</option> = <replaceable>None</replaceable></td>
+        <td>(StrOpt) (Optional) Name of log file to output to. If no default is set, logging will go to stdout.</td>
+      </tr>
+      <tr>
+        <td><option>log_format</option> = <replaceable>None</replaceable></td>
+        <td>(StrOpt) DEPRECATED. A logging.Formatter log message format string which may use any of the available logging.LogRecord attributes. This option is deprecated.  Please use logging_context_format_string and logging_default_format_string instead.</td>
+      </tr>
       <tr>
         <td><option>logging_context_format_string</option> = <replaceable>%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s</replaceable></td>
         <td>(StrOpt) Format string to use for log messages with context.</td>
@@ -85,6 +105,18 @@
         <td><option>syslog_log_facility</option> = <replaceable>LOG_USER</replaceable></td>
         <td>(StrOpt) Syslog facility to receive log lines.</td>
       </tr>
+      <tr>
+        <td><option>syslog_log_facility</option> = <replaceable>LOG_USER</replaceable></td>
+        <td>(StrOpt) Syslog facility to receive log lines.</td>
+      </tr>
+      <tr>
+        <td><option>use_syslog</option> = <replaceable>False</replaceable></td>
+        <td>(BoolOpt) Use syslog for logging. Existing syslog format is DEPRECATED during I, and will change in J to honor RFC5424.</td>
+      </tr>
+      <tr>
+        <td><option>use_syslog_rfc_format</option> = <replaceable>False</replaceable></td>
+        <td>(BoolOpt) (Optional) Enables or disables syslog rfc5424 format for logging. If enabled, prefixes the MSG part of the syslog message with APP-NAME (RFC5424). The format without the APP-NAME is deprecated in I, and will be removed in J.</td>
+      </tr>
       <tr>
         <td><option>use_stderr</option> = <replaceable>True</replaceable></td>
         <td>(BoolOpt) Log output to standard error.</td>

doc/common/tables/nova-metadata.xml

@@ -17,6 +17,10 @@
       <tr>
         <th colspan="2">[DEFAULT]</th>
       </tr>
+      <tr>
+        <td><option>metadata_cache_expiration</option> = <replaceable>15</replaceable></td>
+        <td>(IntOpt) Time in seconds to cache metadata; 0 to disable metadata caching entirely (not recommended). Increasingthis should improve response times of the metadata API when under heavy load. Higher values may increase memoryusage and result in longer times for host metadata changes to take effect.</td>
+      </tr>
       <tr>
         <td><option>metadata_host</option> = <replaceable>$my_ip</replaceable></td>
         <td>(StrOpt) The IP address for the metadata API server</td>

doc/common/tables/nova-network.xml

@@ -139,7 +139,7 @@
       </tr>
       <tr>
         <td><option>iptables_bottom_regex</option> = <replaceable></replaceable></td>
-        <td>(StrOpt) Regular expression to match iptables rule that should always be on the bottom.</td>
+        <td>(StrOpt) Regular expression to match the iptables rule that should always be on the bottom.</td>
       </tr>
       <tr>
         <td><option>iptables_drop_action</option> = <replaceable>DROP</replaceable></td>
@@ -147,7 +147,7 @@
       </tr>
       <tr>
         <td><option>iptables_top_regex</option> = <replaceable></replaceable></td>
-        <td>(StrOpt) Regular expression to match iptables rule that should always be on the top.</td>
+        <td>(StrOpt) Regular expression to match the iptables rule that should always be on the top.</td>
       </tr>
       <tr>
         <td><option>l3_lib</option> = <replaceable>nova.network.l3.LinuxNetL3</replaceable></td>

doc/common/tables/nova-neutron.xml

@@ -26,48 +26,64 @@
       </tr>
       <tr>
         <td><option>admin_auth_url</option> = <replaceable>http://localhost:5000/v2.0</replaceable></td>
-        <td>(StrOpt) Authorization URL for connecting to neutron in admin context</td>
+        <td>(StrOpt) Authorization URL for connecting to neutron in admin context. DEPRECATED: specify an auth_plugin and appropriate credentials instead.</td>
       </tr>
       <tr>
         <td><option>admin_password</option> = <replaceable>None</replaceable></td>
-        <td>(StrOpt) Password for connecting to neutron in admin context</td>
+        <td>(StrOpt) Password for connecting to neutron in admin context DEPRECATED: specify an auth_plugin and appropriate credentials instead.</td>
       </tr>
       <tr>
         <td><option>admin_tenant_id</option> = <replaceable>None</replaceable></td>
-        <td>(StrOpt) Tenant id for connecting to neutron in admin context</td>
+        <td>(StrOpt) Tenant id for connecting to neutron in admin context DEPRECATED: specify an auth_plugin and appropriate credentials instead.</td>
       </tr>
       <tr>
         <td><option>admin_tenant_name</option> = <replaceable>None</replaceable></td>
-        <td>(StrOpt) Tenant name for connecting to neutron in admin context. This option will be ignored if neutron_admin_tenant_id is set. Note that with Keystone V3 tenant names are only unique within a domain.</td>
+        <td>(StrOpt) Tenant name for connecting to neutron in admin context. This option will be ignored if neutron_admin_tenant_id is set. Note that with Keystone V3 tenant names are only unique within a domain. DEPRECATED: specify an auth_plugin and appropriate credentials instead.</td>
       </tr>
       <tr>
         <td><option>admin_user_id</option> = <replaceable>None</replaceable></td>
-        <td>(StrOpt) User id for connecting to neutron in admin context</td>
+        <td>(StrOpt) User id for connecting to neutron in admin context. DEPRECATED: specify an auth_plugin and appropriate credentials instead.</td>
       </tr>
       <tr>
         <td><option>admin_username</option> = <replaceable>None</replaceable></td>
-        <td>(StrOpt) Username for connecting to neutron in admin context</td>
+        <td>(StrOpt) Username for connecting to neutron in admin context DEPRECATED: specify an auth_plugin and appropriate credentials instead.</td>
       </tr>
       <tr>
         <td><option>allow_duplicate_networks</option> = <replaceable>False</replaceable></td>
-        <td>(BoolOpt) Allow an instance to have multiple vNICs attached to the same Neutron network.</td>
+        <td>(BoolOpt) DEPRECATED: Allow an instance to have multiple vNICs attached to the same Neutron network. This option is deprecated in the 2015.1 release and will be removed in the 2015.2 release where the default behavior will be to always allow multiple ports from the same network to be attached to an instance.</td>
       </tr>
       <tr>
-        <td><option>api_insecure</option> = <replaceable>False</replaceable></td>
+        <td><option>auth_plugin</option> = <replaceable>None</replaceable></td>
-        <td>(BoolOpt) If set, ignore any SSL validation issues</td>
+        <td>(StrOpt) Name of the plugin to load</td>
+      </tr>
+      <tr>
+        <td><option>auth_section</option> = <replaceable>None</replaceable></td>
+        <td>(StrOpt) Config Section from which to load plugin specific options</td>
       </tr>
       <tr>
         <td><option>auth_strategy</option> = <replaceable>keystone</replaceable></td>
-        <td>(StrOpt) Authorization strategy for connecting to neutron in admin context</td>
+        <td>(StrOpt) Authorization strategy for connecting to neutron in admin context. DEPRECATED: specify an auth_plugin and appropriate credentials instead. If an auth_plugin is specified strategy will be ignored.</td>
       </tr>
       <tr>
-        <td><option>ca_certificates_file</option> = <replaceable>None</replaceable></td>
+        <td><option>cafile</option> = <replaceable>None</replaceable></td>
-        <td>(StrOpt) Location of CA certificates file to use for neutron client requests.</td>
+        <td>(StrOpt) PEM encoded Certificate Authority to use when verifying HTTPs connections.</td>
+      </tr>
+      <tr>
+        <td><option>certfile</option> = <replaceable>None</replaceable></td>
+        <td>(StrOpt) PEM encoded client certificate cert file</td>
       </tr>
       <tr>
         <td><option>extension_sync_interval</option> = <replaceable>600</replaceable></td>
         <td>(IntOpt) Number of seconds before querying neutron for extensions</td>
       </tr>
+      <tr>
+        <td><option>insecure</option> = <replaceable>False</replaceable></td>
+        <td>(BoolOpt) Verify HTTPS connections.</td>
+      </tr>
+      <tr>
+        <td><option>keyfile</option> = <replaceable>None</replaceable></td>
+        <td>(StrOpt) PEM encoded client certificate key file</td>
+      </tr>
       <tr>
         <td><option>metadata_proxy_shared_secret</option> = <replaceable></replaceable></td>
         <td>(StrOpt) Shared secret to validate proxies Neutron metadata requests</td>
@@ -85,12 +101,12 @@
         <td>(BoolOpt) Set flag to indicate Neutron will proxy metadata requests and resolve instance ids.</td>
       </tr>
       <tr>
-        <td><option>url</option> = <replaceable>http://127.0.0.1:9696</replaceable></td>
+        <td><option>timeout</option> = <replaceable>None</replaceable></td>
-        <td>(StrOpt) URL for connecting to neutron</td>
+        <td>(IntOpt) Timeout value for http requests</td>
       </tr>
       <tr>
-        <td><option>url_timeout</option> = <replaceable>30</replaceable></td>
+        <td><option>url</option> = <replaceable>http://127.0.0.1:9696</replaceable></td>
-        <td>(IntOpt) Timeout value for connecting to neutron in seconds</td>
+        <td>(StrOpt) URL for connecting to neutron</td>
       </tr>
     </tbody>
   </table>

doc/common/tables/nova-policy.xml

@@ -21,17 +21,13 @@
         <td><option>allow_instance_snapshots</option> = <replaceable>True</replaceable></td>
         <td>(BoolOpt) Permit instance snapshot operations.</td>
       </tr>
-      <tr>
-        <td><option>allow_migrate_to_same_host</option> = <replaceable>False</replaceable></td>
-        <td>(BoolOpt) Allow migrate machine to the same host. Useful when testing in single-host environments.</td>
-      </tr>
       <tr>
         <td><option>allow_resize_to_same_host</option> = <replaceable>False</replaceable></td>
         <td>(BoolOpt) Allow destination machine to match source for resize. Useful when testing in single-host environments.</td>
       </tr>
       <tr>
         <td><option>max_age</option> = <replaceable>0</replaceable></td>
-        <td>(IntOpt) Number of seconds between subsequent usage refreshes</td>
+        <td>(IntOpt) Number of seconds between subsequent usage refreshes. This defaults to 0(off) to avoid additional load but it is useful to turn on to help keep quota usage up to date and reduce the impact of out of sync usage issues. Note that quotas are not updated on a periodic task, they will update on a new reservation if max_age has passed since the last reservation</td>
       </tr>
       <tr>
         <td><option>max_local_block_devices</option> = <replaceable>3</replaceable></td>
@@ -55,7 +51,7 @@
       </tr>
       <tr>
         <td><option>policy_dirs</option> = <replaceable>['policy.d']</replaceable></td>
-        <td>(MultiStrOpt) Directories where policy configuration files are stored. They can be relative to any directory in the search path defined by the config_dir option, or absolute paths. The file defined by policy_file must exist for these directories to be searched.</td>
+        <td>(MultiStrOpt) Directories where policy configuration files are stored. They can be relative to any directory in the search path defined by the config_dir option, or absolute paths. The file defined by policy_file must exist for these directories to be searched.  Missing or empty directories are ignored.</td>
       </tr>
       <tr>
         <td><option>policy_file</option> = <replaceable>policy.json</replaceable></td>
@@ -71,7 +67,7 @@
       </tr>
       <tr>
         <td><option>until_refresh</option> = <replaceable>0</replaceable></td>
-        <td>(IntOpt) Count of reservations until usage is refreshed</td>
+        <td>(IntOpt) Count of reservations until usage is refreshed. This defaults to 0(off) to avoid additional load but it is useful to turn on to help keep quota usage up to date and reduce the impact of out of sync usage issues.</td>
       </tr>
     </tbody>
   </table>

doc/common/tables/nova-rpc.xml

@@ -33,10 +33,6 @@
         <td><option>rpc_cast_timeout</option> = <replaceable>30</replaceable></td>
         <td>(IntOpt) Seconds to wait before a cast expires (TTL). Only supported by impl_zmq.</td>
       </tr>
-      <tr>
-        <td><option>rpc_conn_pool_size</option> = <replaceable>30</replaceable></td>
-        <td>(IntOpt) Size of RPC connection pool.</td>
-      </tr>
       <tr>
         <td><option>rpc_response_timeout</option> = <replaceable>60</replaceable></td>
         <td>(IntOpt) Seconds to wait for a response from a call.</td>
@@ -110,6 +106,160 @@
         <td><option>trace</option> = <replaceable>False</replaceable></td>
         <td>(BoolOpt) Debug: dump AMQP frames to stdout</td>
       </tr>
+      <tr>
+        <th colspan="2">[oslo_messaging_qpid]</th>
+      </tr>
+      <tr>
+        <td><option>amqp_auto_delete</option> = <replaceable>False</replaceable></td>
+        <td>(BoolOpt) Auto-delete queues in AMQP.</td>
+      </tr>
+      <tr>
+        <td><option>amqp_durable_queues</option> = <replaceable>False</replaceable></td>
+        <td>(BoolOpt) Use durable queues in AMQP.</td>
+      </tr>
+      <tr>
+        <td><option>qpid_heartbeat</option> = <replaceable>60</replaceable></td>
+        <td>(IntOpt) Seconds between connection keepalive heartbeats.</td>
+      </tr>
+      <tr>
+        <td><option>qpid_hostname</option> = <replaceable>localhost</replaceable></td>
+        <td>(StrOpt) Qpid broker hostname.</td>
+      </tr>
+      <tr>
+        <td><option>qpid_hosts</option> = <replaceable>$qpid_hostname:$qpid_port</replaceable></td>
+        <td>(ListOpt) Qpid HA cluster host:port pairs.</td>
+      </tr>
+      <tr>
+        <td><option>qpid_password</option> = <replaceable></replaceable></td>
+        <td>(StrOpt) Password for Qpid connection.</td>
+      </tr>
+      <tr>
+        <td><option>qpid_port</option> = <replaceable>5672</replaceable></td>
+        <td>(IntOpt) Qpid broker port.</td>
+      </tr>
+      <tr>
+        <td><option>qpid_protocol</option> = <replaceable>tcp</replaceable></td>
+        <td>(StrOpt) Transport to use, either 'tcp' or 'ssl'.</td>
+      </tr>
+      <tr>
+        <td><option>qpid_receiver_capacity</option> = <replaceable>1</replaceable></td>
+        <td>(IntOpt) The number of prefetched messages held by receiver.</td>
+      </tr>
+      <tr>
+        <td><option>qpid_sasl_mechanisms</option> = <replaceable></replaceable></td>
+        <td>(StrOpt) Space separated list of SASL mechanisms to use for auth.</td>
+      </tr>
+      <tr>
+        <td><option>qpid_tcp_nodelay</option> = <replaceable>True</replaceable></td>
+        <td>(BoolOpt) Whether to disable the Nagle algorithm.</td>
+      </tr>
+      <tr>
+        <td><option>qpid_topology_version</option> = <replaceable>1</replaceable></td>
+        <td>(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.</td>
+      </tr>
+      <tr>
+        <td><option>qpid_username</option> = <replaceable></replaceable></td>
+        <td>(StrOpt) Username for Qpid connection.</td>
+      </tr>
+      <tr>
+        <td><option>rpc_conn_pool_size</option> = <replaceable>30</replaceable></td>
+        <td>(IntOpt) Size of RPC connection pool.</td>
+      </tr>
+      <tr>
+        <th colspan="2">[oslo_messaging_rabbit]</th>
+      </tr>
+      <tr>
+        <td><option>amqp_auto_delete</option> = <replaceable>False</replaceable></td>
+        <td>(BoolOpt) Auto-delete queues in AMQP.</td>
+      </tr>
+      <tr>
+        <td><option>amqp_durable_queues</option> = <replaceable>False</replaceable></td>
+        <td>(BoolOpt) Use durable queues in AMQP.</td>
+      </tr>
+      <tr>
+        <td><option>fake_rabbit</option> = <replaceable>False</replaceable></td>
+        <td>(BoolOpt) Deprecated, use rpc_backend=kombu+memory or rpc_backend=fake</td>
+      </tr>
+      <tr>
+        <td><option>heartbeat_rate</option> = <replaceable>2</replaceable></td>
+        <td>(IntOpt) How often times during the heartbeat_timeout_threshold we check the heartbeat.</td>
+      </tr>
+      <tr>
+        <td><option>heartbeat_timeout_threshold</option> = <replaceable>60</replaceable></td>
+        <td>(IntOpt) Number of seconds after which the Rabbit broker is considered down if heartbeat's keep-alive fails (0 disable the heartbeat).</td>
+      </tr>
+      <tr>
+        <td><option>kombu_reconnect_delay</option> = <replaceable>1.0</replaceable></td>
+        <td>(FloatOpt) How long to wait before reconnecting in response to an AMQP consumer cancel notification.</td>
+      </tr>
+      <tr>
+        <td><option>kombu_ssl_ca_certs</option> = <replaceable></replaceable></td>
+        <td>(StrOpt) SSL certification authority file (valid only if SSL enabled).</td>
+      </tr>
+      <tr>
+        <td><option>kombu_ssl_certfile</option> = <replaceable></replaceable></td>
+        <td>(StrOpt) SSL cert file (valid only if SSL enabled).</td>
+      </tr>
+      <tr>
+        <td><option>kombu_ssl_keyfile</option> = <replaceable></replaceable></td>
+        <td>(StrOpt) SSL key file (valid only if SSL enabled).</td>
+      </tr>
+      <tr>
+        <td><option>kombu_ssl_version</option> = <replaceable></replaceable></td>
+        <td>(StrOpt) SSL version to use (valid only if SSL enabled). Valid values are TLSv1 and SSLv23. SSLv2, SSLv3, TLSv1_1, and TLSv1_2 may be available on some distributions.</td>
+      </tr>
+      <tr>
+        <td><option>rabbit_ha_queues</option> = <replaceable>False</replaceable></td>
+        <td>(BoolOpt) Use HA queues in RabbitMQ (x-ha-policy: all). If you change this option, you must wipe the RabbitMQ database.</td>
+      </tr>
+      <tr>
+        <td><option>rabbit_host</option> = <replaceable>localhost</replaceable></td>
+        <td>(StrOpt) The RabbitMQ broker address where a single node is used.</td>
+      </tr>
+      <tr>
+        <td><option>rabbit_hosts</option> = <replaceable>$rabbit_host:$rabbit_port</replaceable></td>
+        <td>(ListOpt) RabbitMQ HA cluster host:port pairs.</td>
+      </tr>
+      <tr>
+        <td><option>rabbit_login_method</option> = <replaceable>AMQPLAIN</replaceable></td>
+        <td>(StrOpt) The RabbitMQ login method.</td>
+      </tr>
+      <tr>
+        <td><option>rabbit_max_retries</option> = <replaceable>0</replaceable></td>
+        <td>(IntOpt) Maximum number of RabbitMQ connection retries. Default is 0 (infinite retry count).</td>
+      </tr>
+      <tr>
+        <td><option>rabbit_password</option> = <replaceable>guest</replaceable></td>
+        <td>(StrOpt) The RabbitMQ password.</td>
+      </tr>
+      <tr>
+        <td><option>rabbit_port</option> = <replaceable>5672</replaceable></td>
+        <td>(IntOpt) The RabbitMQ broker port where a single node is used.</td>
+      </tr>
+      <tr>
+        <td><option>rabbit_retry_backoff</option> = <replaceable>2</replaceable></td>
+        <td>(IntOpt) How long to backoff for between retries when connecting to RabbitMQ.</td>
+      </tr>
+      <tr>
+        <td><option>rabbit_retry_interval</option> = <replaceable>1</replaceable></td>
+        <td>(IntOpt) How frequently to retry connecting with RabbitMQ.</td>
+      </tr>
+      <tr>
+        <td><option>rabbit_use_ssl</option> = <replaceable>False</replaceable></td>
+        <td>(BoolOpt) Connect over SSL for RabbitMQ.</td>
+      </tr>
+      <tr>
+        <td><option>rabbit_userid</option> = <replaceable>guest</replaceable></td>
+        <td>(StrOpt) The RabbitMQ userid.</td>
+      </tr>
+      <tr>
+        <td><option>rabbit_virtual_host</option> = <replaceable>/</replaceable></td>
+        <td>(StrOpt) The RabbitMQ virtual host.</td>
+      </tr>
+      <tr>
+        <td><option>rpc_conn_pool_size</option> = <replaceable>30</replaceable></td>
+        <td>(IntOpt) Size of RPC connection pool.</td>
+      </tr>
       <tr>
         <th colspan="2">[upgrade_levels]</th>
       </tr>

doc/common/tables/nova-scheduler.xml

@@ -101,6 +101,10 @@
         <td><option>scheduler_host_subset_size</option> = <replaceable>1</replaceable></td>
         <td>(IntOpt) New instances will be scheduled on a host chosen randomly from a subset of the N best hosts. This property defines the subset size that a host is chosen from. A value of 1 chooses the first host returned by the weighing functions. This value must be at least 1. Any value less than 1 will be ignored, and 1 will be used instead</td>
       </tr>
+      <tr>
+        <td><option>scheduler_instance_sync_interval</option> = <replaceable>120</replaceable></td>
+        <td>(IntOpt) Waiting time interval (seconds) between sending the scheduler a list of current instance UUIDs to verify that its view of instances is in sync with nova. If the CONF option `scheduler_tracks_instance_changes` is False, changing this option will have no effect.</td>
+      </tr>
       <tr>
         <td><option>scheduler_json_config_location</option> = <replaceable></replaceable></td>
         <td>(StrOpt) Absolute path to scheduler configuration JSON file.</td>
@@ -117,6 +121,10 @@
         <td><option>scheduler_topic</option> = <replaceable>scheduler</replaceable></td>
         <td>(StrOpt) The topic scheduler nodes listen on</td>
       </tr>
+      <tr>
+        <td><option>scheduler_tracks_instance_changes</option> = <replaceable>True</replaceable></td>
+        <td>(BoolOpt) Determines if the Scheduler tracks changes to instances to help with its filtering decisions.</td>
+      </tr>
       <tr>
         <td><option>scheduler_use_baremetal_filters</option> = <replaceable>False</replaceable></td>
         <td>(BoolOpt) Flag to decide whether to use baremetal_scheduler_default_filters or not.</td>

doc/common/tables/nova-testing.xml

@@ -25,10 +25,6 @@
         <td><option>fake_network</option> = <replaceable>False</replaceable></td>
         <td>(BoolOpt) If passed, use fake network devices and addresses</td>
       </tr>
-      <tr>
-        <td><option>fake_rabbit</option> = <replaceable>False</replaceable></td>
-        <td>(BoolOpt) Deprecated, use rpc_backend=kombu+memory or rpc_backend=fake</td>
-      </tr>
       <tr>
         <td><option>monkey_patch</option> = <replaceable>False</replaceable></td>
         <td>(BoolOpt) Whether to log monkey patching</td>

doc/common/tables/nova-vmware.xml

@@ -29,6 +29,10 @@
         <td><option>cluster_name</option> = <replaceable>None</replaceable></td>
         <td>(MultiStrOpt) Name of a VMware Cluster ComputeResource.</td>
       </tr>
+      <tr>
+        <td><option>console_delay_seconds</option> = <replaceable>None</replaceable></td>
+        <td>(IntOpt) Set this value if affected by an increased network latency causing repeated characters when typing in a remote console.</td>
+      </tr>
       <tr>
         <td><option>datastore_regex</option> = <replaceable>None</replaceable></td>
         <td>(StrOpt) Regex to match the name of a datastore.</td>

doc/common/tables/nova-vpn.xml

@@ -23,7 +23,7 @@
       </tr>
       <tr>
         <td><option>dmz_cidr</option> = <replaceable></replaceable></td>
-        <td>(ListOpt) A list of dmz range that should be accepted</td>
+        <td>(ListOpt) A list of dmz ranges that should be accepted</td>
       </tr>
       <tr>
         <td><option>dmz_mask</option> = <replaceable>255.255.255.0</replaceable></td>

tools/autogenerate-config-flagmappings/nova.flagmappings

@@ -1,11 +1,8 @@
 aggregate_image_properties_isolation_namespace scheduler
 aggregate_image_properties_isolation_separator scheduler
 allow_instance_snapshots policy
-allow_migrate_to_same_host policy
 allow_resize_to_same_host policy
 allow_same_net_traffic network
-amqp_auto_delete amqp
-amqp_durable_queues amqp
 api_paste_config api
 api_rate_limit api
 auth_strategy authentication
@@ -95,7 +92,6 @@ enabled_apis api
 enabled_ssl_apis api
 fake_call testing
 fake_network testing
-fake_rabbit testing
 fatal_deprecations logging
 fatal_exception_format_errors logging
 firewall_driver network
@@ -143,11 +139,6 @@ key_file ca
 keys_path ca
 keystone_ec2_insecure ec2
 keystone_ec2_url ec2
-kombu_reconnect_delay rabbitmq
-kombu_ssl_ca_certs rabbitmq
-kombu_ssl_certfile rabbitmq
-kombu_ssl_keyfile rabbitmq
-kombu_ssl_version rabbitmq
 l3_lib network
 ldap_dns_base_dn ldap
 ldap_dns_password ldap
@@ -165,6 +156,11 @@ live_migration_retry_count livemigration
 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
@@ -184,6 +180,7 @@ max_io_ops_per_host scheduler
 max_local_block_devices policy
 maximum_instance_delete_attempts compute
 memcached_servers common
+metadata_cache_expiration metadata
 metadata_host metadata
 metadata_listen metadata
 metadata_listen_port metadata
@@ -241,17 +238,6 @@ 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_receiver_capacity qpid
-qpid_sasl_mechanisms qpid
-qpid_tcp_nodelay qpid
-qpid_topology_version qpid
-qpid_username qpid
 quota_cores quota
 quota_driver quota
 quota_fixed_ips quota
@@ -268,18 +254,6 @@ quota_security_group_rules quota
 quota_security_groups quota
 quota_server_group_members quota
 quota_server_groups quota
-rabbit_ha_queues rabbitmq
-rabbit_host rabbitmq
-rabbit_hosts rabbitmq
-rabbit_login_method 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
 ram_allocation_ratio scheduler
 ram_weight_multiplier scheduler
 reboot_timeout compute
@@ -301,7 +275,6 @@ 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
@@ -329,10 +302,12 @@ scheduler_driver scheduler
 scheduler_driver_task_period scheduler
 scheduler_host_manager scheduler
 scheduler_host_subset_size scheduler
+scheduler_instance_sync_interval scheduler
 scheduler_json_config_location scheduler
 scheduler_manager scheduler
 scheduler_max_attempts scheduler
 scheduler_topic scheduler
+scheduler_tracks_instance_changes scheduler
 scheduler_use_baremetal_filters scheduler
 scheduler_weight_classes scheduler
 security_group_api network
@@ -353,6 +328,7 @@ ssl_only vnc
 state_path common
 stub_compute xen
 sync_power_state_interval compute
+syslog-log-facility logging
 syslog_log_facility logging
 tcp_keepidle api
 teardown_unused_network_gateway network
@@ -361,6 +337,9 @@ timeout_nbd hypervisor
 transport_url amqp
 until_refresh policy
 update_dns_entries network
+update_resources_interval common
+use-syslog logging
+use-syslog-rfc-format logging
 use_cow_images hypervisor
 use_forwarded_for api
 use_ipv6 ipv6
@@ -399,6 +378,18 @@ wsgi_log_format api
 xvpvncproxy_base_url xvpnvncproxy
 xvpvncproxy_host xvpnvncproxy
 xvpvncproxy_port xvpnvncproxy
+api_database/connection database
+api_database/connection_debug database
+api_database/connection_trace database
+api_database/idle_timeout database
+api_database/max_overflow database
+api_database/max_pool_size database
+api_database/max_retries database
+api_database/mysql_sql_mode database
+api_database/pool_timeout database
+api_database/retry_interval database
+api_database/slave_connection database
+api_database/sqlite_synchronous database
 barbican/cafile barbican
 barbican/catalog_info barbican
 barbican/certfile barbican
@@ -602,7 +593,6 @@ libvirt/use_virtio_for_bridges libvirt
 libvirt/virt_type libvirt
 libvirt/volume_clear libvirt
 libvirt/volume_clear_size libvirt
-libvirt/volume_drivers libvirt
 libvirt/wait_soft_reboot_seconds libvirt
 libvirt/xen_hvmloader_path xen
 matchmaker_redis/host redis
@@ -620,16 +610,20 @@ neutron/admin_tenant_name neutron
 neutron/admin_user_id neutron
 neutron/admin_username neutron
 neutron/allow_duplicate_networks neutron
-neutron/api_insecure neutron
+neutron/auth_plugin neutron
+neutron/auth_section neutron
 neutron/auth_strategy neutron
-neutron/ca_certificates_file neutron
+neutron/cafile neutron
+neutron/certfile neutron
 neutron/extension_sync_interval neutron
+neutron/insecure neutron
+neutron/keyfile neutron
 neutron/metadata_proxy_shared_secret neutron
 neutron/ovs_bridge neutron
 neutron/region_name neutron
 neutron/service_metadata_proxy neutron
+neutron/timeout neutron
 neutron/url neutron
-neutron/url_timeout neutron
 osapi_v3/enabled apiv3
 osapi_v3/extensions_blacklist apiv3
 osapi_v3/extensions_whitelist apiv3
@@ -646,6 +640,43 @@ oslo_messaging_amqp/ssl_cert_file rpc
 oslo_messaging_amqp/ssl_key_file rpc
 oslo_messaging_amqp/ssl_key_password rpc
 oslo_messaging_amqp/trace rpc
+oslo_messaging_qpid/amqp_auto_delete rpc
+oslo_messaging_qpid/amqp_durable_queues rpc
+oslo_messaging_qpid/qpid_heartbeat rpc
+oslo_messaging_qpid/qpid_hostname rpc
+oslo_messaging_qpid/qpid_hosts rpc
+oslo_messaging_qpid/qpid_password rpc
+oslo_messaging_qpid/qpid_port rpc
+oslo_messaging_qpid/qpid_protocol rpc
+oslo_messaging_qpid/qpid_receiver_capacity rpc
+oslo_messaging_qpid/qpid_sasl_mechanisms rpc
+oslo_messaging_qpid/qpid_tcp_nodelay rpc
+oslo_messaging_qpid/qpid_topology_version rpc
+oslo_messaging_qpid/qpid_username rpc
+oslo_messaging_qpid/rpc_conn_pool_size rpc
+oslo_messaging_rabbit/amqp_auto_delete rpc
+oslo_messaging_rabbit/amqp_durable_queues rpc
+oslo_messaging_rabbit/fake_rabbit rpc
+oslo_messaging_rabbit/heartbeat_rate rpc
+oslo_messaging_rabbit/heartbeat_timeout_threshold rpc
+oslo_messaging_rabbit/kombu_reconnect_delay rpc
+oslo_messaging_rabbit/kombu_ssl_ca_certs rpc
+oslo_messaging_rabbit/kombu_ssl_certfile rpc
+oslo_messaging_rabbit/kombu_ssl_keyfile rpc
+oslo_messaging_rabbit/kombu_ssl_version rpc
+oslo_messaging_rabbit/rabbit_ha_queues rpc
+oslo_messaging_rabbit/rabbit_host rpc
+oslo_messaging_rabbit/rabbit_hosts rpc
+oslo_messaging_rabbit/rabbit_login_method rpc
+oslo_messaging_rabbit/rabbit_max_retries rpc
+oslo_messaging_rabbit/rabbit_password rpc
+oslo_messaging_rabbit/rabbit_port rpc
+oslo_messaging_rabbit/rabbit_retry_backoff rpc
+oslo_messaging_rabbit/rabbit_retry_interval rpc
+oslo_messaging_rabbit/rabbit_use_ssl rpc
+oslo_messaging_rabbit/rabbit_userid rpc
+oslo_messaging_rabbit/rabbit_virtual_host rpc
+oslo_messaging_rabbit/rpc_conn_pool_size rpc
 rdp/enabled rdp
 rdp/html5_proxy_base_url rdp
 serial_console/base_url serial_console
@@ -686,6 +717,7 @@ upgrade_levels/scheduler upgrade_levels
 vmware/api_retry_count vmware
 vmware/cache_prefix vmware
 vmware/cluster_name vmware
+vmware/console_delay_seconds vmware
 vmware/datastore_regex vmware
 vmware/host_ip vmware
 vmware/host_password vmware
@@ -702,6 +734,7 @@ vmware/vlan_interface network
 vmware/vnc_port vnc
 vmware/vnc_port_total vnc
 vmware/wsdl_location vmware
+workarounds/destroy_after_evacuate common
 workarounds/disable_libvirt_livesnapshot common
 workarounds/disable_rootwrap common
 xenserver/agent_path xen