Regenerate config reference tables

Move some headers to shared.headers and unify naming. The unification
let to rename of keystone-rabbit.xml to keystone-rabbitmq.xml and
glance-zmq.xml to glance-zeromq.xml.
Fixed typo in name of neutron-lbaas_netscaler.

Partial-Bug: #1362882
Partial-Bug: #1362266
Closes-Bug: #1361402

Change-Id: I3be75b2ca41e1f56189b317a7dabfc9ac3e4fbab

doc/common/tables/ceilometer-api.xml

@@ -21,10 +21,6 @@
         <td>api_paste_config = api_paste.ini</td>
         <td>(StrOpt) Configuration file for WSGI definition of API.</td>
       </tr>
-      <tr>
-        <td>max_request_body_size = 114688</td>
-        <td>(IntOpt) The maximum body size for each  request, in bytes.</td>
-      </tr>
       <tr>
         <td>pipeline_cfg_file = pipeline.yaml</td>
         <td>(StrOpt) Configuration file for pipeline definition.</td>

doc/common/tables/ceilometer-database.xml

@@ -30,51 +30,51 @@
       </tr>
       <tr>
         <td>backend = sqlalchemy</td>
-        <td>(StrOpt) The backend to use for db</td>
+        <td>(StrOpt) The back end to use for the database.</td>
       </tr>
       <tr>
         <td>connection = None</td>
-        <td>(StrOpt) The SQLAlchemy connection string used to connect to the database</td>
+        <td>(StrOpt) The SQLAlchemy connection string to use to connect to the database.</td>
       </tr>
       <tr>
         <td>connection_debug = 0</td>
-        <td>(IntOpt) Verbosity of SQL debugging information. 0=None, 100=Everything</td>
+        <td>(IntOpt) Verbosity of SQL debugging information: 0=None, 100=Everything.</td>
       </tr>
       <tr>
         <td>connection_trace = False</td>
-        <td>(BoolOpt) Add python stack traces to SQL as comment strings</td>
+        <td>(BoolOpt) Add Python stack traces to SQL as comment strings.</td>
       </tr>
       <tr>
         <td>db_inc_retry_interval = True</td>
-        <td>(BoolOpt) Whether to increase interval between db connection retries, up to db_max_retry_interval</td>
+        <td>(BoolOpt) If True, increases the interval between database connection retries up to db_max_retry_interval.</td>
       </tr>
       <tr>
         <td>db_max_retries = 20</td>
-        <td>(IntOpt) maximum db connection retries before error is raised. (setting -1 implies an infinite retry count)</td>
+        <td>(IntOpt) Maximum database connection retries before error is raised. Set to -1 to specify an infinite retry count.</td>
       </tr>
       <tr>
         <td>db_max_retry_interval = 10</td>
-        <td>(IntOpt) max seconds between db connection retries, if db_inc_retry_interval is enabled</td>
+        <td>(IntOpt) If db_inc_retry_interval is set, the maximum seconds between database connection retries.</td>
       </tr>
       <tr>
         <td>db_retry_interval = 1</td>
-        <td>(IntOpt) seconds between db connection retries</td>
+        <td>(IntOpt) Seconds between database connection retries.</td>
       </tr>
       <tr>
         <td>idle_timeout = 3600</td>
-        <td>(IntOpt) Timeout before idle sql connections are reaped</td>
+        <td>(IntOpt) Timeout before idle SQL connections are reaped.</td>
       </tr>
       <tr>
         <td>max_overflow = None</td>
-        <td>(IntOpt) If set, use this value for max_overflow with sqlalchemy</td>
+        <td>(IntOpt) If set, use this value for max_overflow with SQLAlchemy.</td>
       </tr>
       <tr>
         <td>max_pool_size = None</td>
-        <td>(IntOpt) Maximum number of SQL connections to keep open in a pool</td>
+        <td>(IntOpt) Maximum number of SQL connections to keep open in a pool.</td>
       </tr>
       <tr>
         <td>max_retries = 10</td>
-        <td>(IntOpt) Maximum db connection retries during startup. (setting -1 implies an infinite retry count)</td>
+        <td>(IntOpt) Maximum db connection retries during startup. Set to -1 to specify an infinite retry count.</td>
       </tr>
       <tr>
         <td>metering_connection = None</td>
@@ -82,7 +82,7 @@
       </tr>
       <tr>
         <td>min_pool_size = 1</td>
-        <td>(IntOpt) Minimum number of SQL connections to keep open in a pool</td>
+        <td>(IntOpt) Minimum number of SQL connections to keep open in a pool.</td>
       </tr>
       <tr>
         <td>mysql_sql_mode = TRADITIONAL</td>
@@ -90,19 +90,23 @@
       </tr>
       <tr>
         <td>pool_timeout = None</td>
-        <td>(IntOpt) If set, use this value for pool_timeout with sqlalchemy</td>
+        <td>(IntOpt) If set, use this value for pool_timeout with SQLAlchemy.</td>
       </tr>
       <tr>
         <td>retry_interval = 10</td>
-        <td>(IntOpt) Interval between retries of opening a sql connection</td>
+        <td>(IntOpt) Interval between retries of opening a SQL connection.</td>
       </tr>
       <tr>
-        <td>sqlite_db = ceilometer.sqlite</td>
+        <td>slave_connection = None</td>
-        <td>(StrOpt) The file name to use with SQLite</td>
+        <td>(StrOpt) The SQLAlchemy connection string to use to connect to the slave database.</td>
+      </tr>
+      <tr>
+        <td>sqlite_db = oslo.sqlite</td>
+        <td>(StrOpt) The file name to use with SQLite.</td>
       </tr>
       <tr>
         <td>sqlite_synchronous = True</td>
-        <td>(BoolOpt) If True, SQLite uses synchronous mode</td>
+        <td>(BoolOpt) If True, SQLite uses synchronous mode.</td>
       </tr>
       <tr>
         <td>time_to_live = -1</td>
@@ -110,7 +114,7 @@
       </tr>
       <tr>
         <td>use_db_reconnect = False</td>
-        <td>(BoolOpt) Enable the experimental use of database reconnect on connection lost</td>
+        <td>(BoolOpt) Enable the experimental use of database reconnect on connection lost.</td>
       </tr>
     </tbody>
   </table>

doc/common/tables/cinder-common.xml

@@ -21,6 +21,10 @@
         <td>compute_api_class = cinder.compute.nova.API</td>
         <td>(StrOpt) The full class name of the compute API class to use</td>
       </tr>
+      <tr>
+        <td>consistencygroup_api_class = cinder.consistencygroup.api.API</td>
+        <td>(StrOpt) The full class name of the consistencygroup API class</td>
+      </tr>
       <tr>
         <td>debug = False</td>
         <td>(BoolOpt) Print debugging output (set logging level to DEBUG instead of default WARNING level).</td>

doc/common/tables/cinder-quota.xml

@@ -21,6 +21,10 @@
         <td>max_age = 0</td>
         <td>(IntOpt) Number of seconds between subsequent usage refreshes</td>
       </tr>
+      <tr>
+        <td>quota_consistencygroups = 10</td>
+        <td>(IntOpt) Number of consistencygroups allowed per project</td>
+      </tr>
       <tr>
         <td>quota_driver = cinder.quota.DbQuotaDriver</td>
         <td>(StrOpt) Default driver to use for quota checks</td>

doc/common/tables/cinder-zfssa.xml

@@ -0,0 +1,82 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<para xmlns="http://docbook.org/ns/docbook" version="5.0">
+  <!-- Warning: Do not edit this file. It is automatically
+     generated and your changes will be overwritten.
+     The tool to do so lives in openstack-doc-tools repository. -->
+  <table rules="all" xml:id="config_table_cinder_zfssa">
+    <caption>Description of ZFS Storage Appliance iSCSI driver configuration options</caption>
+    <col width="50%"/>
+    <col width="50%"/>
+    <thead>
+      <tr>
+        <th>Configuration option = Default value</th>
+        <th>Description</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <th colspan="2">[DEFAULT]</th>
+      </tr>
+      <tr>
+        <td>zfssa_initiator = </td>
+        <td>(StrOpt) iSCSI initiator IQNs. (comma separated)</td>
+      </tr>
+      <tr>
+        <td>zfssa_initiator_group = </td>
+        <td>(StrOpt) iSCSI initiator group.</td>
+      </tr>
+      <tr>
+        <td>zfssa_initiator_password = </td>
+        <td>(StrOpt) iSCSI initiator CHAP password.</td>
+      </tr>
+      <tr>
+        <td>zfssa_initiator_user = </td>
+        <td>(StrOpt) iSCSI initiator CHAP user.</td>
+      </tr>
+      <tr>
+        <td>zfssa_lun_compression = </td>
+        <td>(StrOpt) Data compression-off, lzjb, gzip-2, gzip, gzip-9.</td>
+      </tr>
+      <tr>
+        <td>zfssa_lun_logbias = </td>
+        <td>(StrOpt) Synchronous write bias-latency, throughput.</td>
+      </tr>
+      <tr>
+        <td>zfssa_lun_sparse = False</td>
+        <td>(BoolOpt) Flag to enable sparse (thin-provisioned): True, False.</td>
+      </tr>
+      <tr>
+        <td>zfssa_lun_volblocksize = 8k</td>
+        <td>(StrOpt) Block size: 512, 1k, 2k, 4k, 8k, 16k, 32k, 64k, 128k.</td>
+      </tr>
+      <tr>
+        <td>zfssa_pool = None</td>
+        <td>(StrOpt) Storage pool name.</td>
+      </tr>
+      <tr>
+        <td>zfssa_project = None</td>
+        <td>(StrOpt) Project name.</td>
+      </tr>
+      <tr>
+        <td>zfssa_target_group = tgt-grp</td>
+        <td>(StrOpt) iSCSI target group name.</td>
+      </tr>
+      <tr>
+        <td>zfssa_target_interfaces = None</td>
+        <td>(StrOpt) Network interfaces of iSCSI targets. (comma separated)</td>
+      </tr>
+      <tr>
+        <td>zfssa_target_password = </td>
+        <td>(StrOpt) iSCSI target CHAP password.</td>
+      </tr>
+      <tr>
+        <td>zfssa_target_portal = None</td>
+        <td>(StrOpt) iSCSI target portal (Data-IP:Port, w.x.y.z:3260).</td>
+      </tr>
+      <tr>
+        <td>zfssa_target_user = </td>
+        <td>(StrOpt) iSCSI target CHAP user.</td>
+      </tr>
+    </tbody>
+  </table>
+</para>

doc/common/tables/glance-zeromq.xml

@@ -3,7 +3,7 @@
   <!-- Warning: Do not edit this file. It is automatically
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
-  <table rules="all" xml:id="config_table_glance_zmq">
+  <table rules="all" xml:id="config_table_glance_zeromq">
     <caption>Description of ZeroMQ configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>

doc/common/tables/heat-common.xml

@@ -41,6 +41,10 @@
         <td>keystone_backend = heat.common.heat_keystoneclient.KeystoneClientV3</td>
         <td>(StrOpt) Fully qualified class name to use as a keystone backend.</td>
       </tr>
+      <tr>
+        <td>networking_service = None</td>
+        <td>(StrOpt) Select OpenStack component responsible for networking - nova or neutron.</td>
+      </tr>
       <tr>
         <td>periodic_interval = 60</td>
         <td>(IntOpt) Seconds between running periodic tasks.</td>

doc/common/tables/keystone-rabbitmq.xml

@@ -3,7 +3,7 @@
   <!-- Warning: Do not edit this file. It is automatically
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
-  <table rules="all" xml:id="config_table_keystone_rabbit">
+  <table rules="all" xml:id="config_table_keystone_rabbitmq">
     <caption>Description of RabbitMQ configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>

doc/common/tables/neutron-cisco.xml

@@ -92,6 +92,10 @@
         <td>poll_duration = 60</td>
         <td>(IntOpt) N1K Policy profile polling duration in seconds</td>
       </tr>
+      <tr>
+        <td>restrict_policy_profiles = False</td>
+        <td>(BoolOpt) Restrict the visibility of policy profiles to the tenants</td>
+      </tr>
       <tr>
         <td>tenant_network_type = local</td>
         <td>(StrOpt) N1K Tenant Network Type</td>

doc/common/tables/neutron-l3_arista.xml

@@ -0,0 +1,50 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<para xmlns="http://docbook.org/ns/docbook" version="5.0">
+  <!-- Warning: Do not edit this file. It is automatically
+     generated and your changes will be overwritten.
+     The tool to do so lives in openstack-doc-tools repository. -->
+  <table rules="all" xml:id="config_table_neutron_l3_arista">
+    <caption>Description of Arista layer-3 service plug-in configuration options</caption>
+    <col width="50%"/>
+    <col width="50%"/>
+    <thead>
+      <tr>
+        <th>Configuration option = Default value</th>
+        <th>Description</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <th colspan="2">[l3_arista]</th>
+      </tr>
+      <tr>
+        <td>l3_sync_interval = 180</td>
+        <td>(IntOpt) Sync interval in seconds between L3 Service plugin and EOS. This interval defines how often the synchronization is performed. This is an optional field. If not set, a value of 180 seconds is assumed</td>
+      </tr>
+      <tr>
+        <td>mlag_config = False</td>
+        <td>(BoolOpt) This flag is used indicate if Arista Switches are configured in MLAG mode. If yes, all L3 config is pushed to both the switches automatically. If this flag is set to True, ensure to specify IP addresses of both switches. This is optional. If not set, a value of "False" is assumed.</td>
+      </tr>
+      <tr>
+        <td>primary_l3_host = </td>
+        <td>(StrOpt) Arista EOS IP address. This is required field. If not set, all communications to Arista EOS will fail</td>
+      </tr>
+      <tr>
+        <td>primary_l3_host_password = </td>
+        <td>(StrOpt) Password for Arista EOS. This is required field. If not set, all communications to Arista EOS will fail</td>
+      </tr>
+      <tr>
+        <td>primary_l3_host_username = </td>
+        <td>(StrOpt) Username for Arista EOS. This is required field. If not set, all communications to Arista EOS will fail</td>
+      </tr>
+      <tr>
+        <td>secondary_l3_host = </td>
+        <td>(StrOpt) Arista EOS IP address for second Switch MLAGed with the first one. This an optional field, however, if mlag_config flag is set, then this is required. If not set, all communications to Arista EOS will fail</td>
+      </tr>
+      <tr>
+        <td>use_vrf = False</td>
+        <td>(BoolOpt) A "True" value for this flag indicates to create a router in VRF. If not set, all routers are created in default VRF.This is optional. If not set, a value of "False" is assumed.</td>
+      </tr>
+    </tbody>
+  </table>
+</para>

doc/common/tables/neutron-lbaas_netscaler.xml

@@ -3,7 +3,7 @@
   <!-- Warning: Do not edit this file. It is automatically
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
-  <table rules="all" xml:id="config_table_neutron_lbaas_netscalar">
+  <table rules="all" xml:id="config_table_neutron_lbaas_netscaler">
     <caption>Description of LBaaS Netscaler configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>

doc/common/tables/neutron-ml2_cisco_apic.xml

@@ -30,8 +30,8 @@
         <td>(StrOpt) Name of the function profile to be created</td>
       </tr>
       <tr>
-        <td>apic_host = None</td>
+        <td>apic_hosts = </td>
-        <td>(StrOpt) Host name or IP Address of the APIC controller</td>
+        <td>(ListOpt) An ordered list of host names or IP addresses of the APIC controller(s).</td>
       </tr>
       <tr>
         <td>apic_node_profile = openstack_profile</td>
@@ -42,8 +42,8 @@
         <td>(StrOpt) Password for the APIC controller</td>
       </tr>
       <tr>
-        <td>apic_port = None</td>
+        <td>apic_use_ssl = True</td>
-        <td>(StrOpt) Communication port for the APIC controller</td>
+        <td>(BoolOpt) Use SSL to connect to the APIC controller</td>
       </tr>
       <tr>
         <td>apic_username = None</td>

doc/common/tables/neutron-openvswitch_agent.xml

@@ -42,7 +42,7 @@
       </tr>
       <tr>
         <td>enable_distributed_routing = False</td>
-        <td>(BoolOpt) Make the l2 agent run in DVR mode.</td>
+        <td>(BoolOpt) Make the l2 agent run in DVR mode</td>
       </tr>
       <tr>
         <td>l2_population = False</td>

doc/common/tables/trove-api.xml

@@ -21,14 +21,14 @@
         <td>admin_roles = admin</td>
         <td>(ListOpt) No help text available for this option.</td>
       </tr>
-      <tr>
-        <td>api_extensions_path = $pybasedir/extensions/routes</td>
-        <td>(StrOpt) Path to extensions.</td>
-      </tr>
       <tr>
         <td>api_paste_config = api-paste.ini</td>
         <td>(StrOpt) File name for the paste.deploy config for trove-api.</td>
       </tr>
+      <tr>
+        <td>bind_host = 0.0.0.0</td>
+        <td>(StrOpt) The IP address the API will listen on.</td>
+      </tr>
       <tr>
         <td>bind_port = 8779</td>
         <td>(IntOpt) No help text available for this option.</td>

doc/common/tables/trove-auth_token.xml

@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_trove_auth_token">
-    <caption>Description of authentication token configuration options</caption>
+    <caption>Description of authorization token configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>

doc/common/tables/trove-common.xml

@@ -73,6 +73,10 @@
         <td>template_path = /etc/trove/templates/</td>
         <td>(StrOpt) Path which leads to datastore templates.</td>
       </tr>
+      <tr>
+        <td>usage_timeout = 600</td>
+        <td>(IntOpt) Timeout to wait for a guest to become active.</td>
+      </tr>
     </tbody>
   </table>
 </para>

doc/common/tables/trove-db_cassandra.xml

@@ -41,10 +41,6 @@
         <td>udp_ports = </td>
         <td>(ListOpt) List of UDP ports and/or port ranges to open in the security group (only applicable if trove_security_groups_support is True).</td>
       </tr>
-      <tr>
-        <td>usage_timeout = 600</td>
-        <td>(IntOpt) Timeout to wait for a guest to become active.</td>
-      </tr>
       <tr>
         <td>volume_support = True</td>
         <td>(BoolOpt) Whether to provision a cinder volume for datadir.</td>

doc/common/tables/trove-db_couchbase.xml

@@ -53,10 +53,6 @@
         <td>udp_ports = </td>
         <td>(ListOpt) List of UDP ports and/or port ranges to open in the security group (only applicable if trove_security_groups_support is True).</td>
       </tr>
-      <tr>
-        <td>usage_timeout = 450</td>
-        <td>(IntOpt) Timeout to wait for a guest to become active.</td>
-      </tr>
       <tr>
         <td>volume_support = True</td>
         <td>(BoolOpt) Whether to provision a cinder volume for datadir.</td>

doc/common/tables/trove-db_mongodb.xml

@@ -41,10 +41,6 @@
         <td>udp_ports = </td>
         <td>(ListOpt) List of UPD ports and/or port ranges to open in the security group (only applicable if trove_security_groups_support is True).</td>
       </tr>
-      <tr>
-        <td>usage_timeout = 450</td>
-        <td>(IntOpt) Timeout to wait for a guest to become active.</td>
-      </tr>
       <tr>
         <td>volume_support = True</td>
         <td>(BoolOpt) Whether to provision a cinder volume for datadir.</td>

doc/common/tables/trove-db_redis.xml

@@ -41,10 +41,6 @@
         <td>udp_ports = </td>
         <td>(ListOpt) List of UDP ports and/or port ranges to open in the security group (only applicable if trove_security_groups_support is True).</td>
       </tr>
-      <tr>
-        <td>usage_timeout = 450</td>
-        <td>(IntOpt) Timeout to wait for a guest to become active.</td>
-      </tr>
       <tr>
         <td>volume_support = False</td>
         <td>(BoolOpt) Whether to provision a cinder volume for datadir.</td>

doc/common/tables/trove-swift.xml

@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_trove_swift">
-    <caption>Description of Object Storage configuration options</caption>
+    <caption>Description of swift configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>

doc/config-reference/block-storage/section_misc.xml

@@ -32,6 +32,7 @@
     <xi:include href="../../common/tables/cinder-api.xml"/>
     <xi:include href="../../common/tables/cinder-hplefthand.xml"/>
     <xi:include href="../../common/tables/cinder-scality.xml"/>
+    <xi:include href="../../common/tables/cinder-zfssa.xml"/>
     <xi:include href="../../common/tables/cinder-block-device.xml"/>
     <xi:include href="../../common/tables/cinder-compute.xml"/>
     <xi:include href="../../common/tables/cinder-san.xml"/>

doc/config-reference/ch_identityconfigure.xml

@@ -83,7 +83,7 @@ options. For installation prerequisites and step-by-step walkthroughs, see the
     <xi:include href="../common/tables/keystone-rpc.xml"/>
     <xi:include href="../common/tables/keystone-amqp.xml"/>
     <xi:include href="../common/tables/keystone-qpid.xml"/>
-    <xi:include href="../common/tables/keystone-rabbit.xml"/>
+    <xi:include href="../common/tables/keystone-rabbitmq.xml"/>
     <xi:include href="../common/tables/keystone-zeromq.xml"/>
     <xi:include href="../common/tables/keystone-redis.xml"/>
     </section>

doc/config-reference/image-service/section_image-service-rpc.xml

@@ -15,7 +15,7 @@
     messaging middleware for the Image Service:</para>
   <xi:include href="../../common/tables/glance-rabbitmq.xml"/>
   <xi:include href="../../common/tables/glance-qpid.xml"/>
-  <xi:include href="../../common/tables/glance-zmq.xml"/>
+  <xi:include href="../../common/tables/glance-zeromq.xml"/>
   <xi:include href="../../common/tables/glance-amqp.xml"/>
   <xi:include href="../../common/tables/glance-rpc.xml"/>
 </section>

doc/config-reference/networking/section_networking-options-reference.xml

@@ -91,7 +91,7 @@ Load-Balancer-as-a-Service related settings.</para>
     file for the LBaaS agent.</para>
 <xi:include href="../../common/tables/neutron-lbaas.xml"/>
 <xi:include href="../../common/tables/neutron-lbaas_haproxy.xml"/>
-<xi:include href="../../common/tables/neutron-lbaas_netscalar.xml"/>
+<xi:include href="../../common/tables/neutron-lbaas_netscaler.xml"/>
 <xi:include href="../../common/tables/neutron-lbaas_radware.xml"/>
 </section>
 

doc/config-reference/networking/section_networking-plugins-ml2.xml

@@ -66,6 +66,7 @@
             options</title>
         <xi:include href="../../common/tables/neutron-ml2_arista.xml"
         />
+        <xi:include href="../../common/tables/neutron-l3_arista.xml"/>
     </section>
     <section xml:id="networking-plugin-ml2_bigswitch">
         <title>Modular Layer 2 (ml2) BigSwitch Mechanism configuration

tools/autogenerate-config-flagmappings/ceilometer.flagmappings

@@ -41,7 +41,6 @@ logging_default_format_string logging
 logging_exception_prefix logging
 matchmaker_heartbeat_freq redis
 matchmaker_heartbeat_ttl redis
-max_request_body_size api
 memcached_servers common
 neutron_control_exchange exchange
 notification_driver amqp
@@ -141,6 +140,7 @@ database/min_pool_size database
 database/mysql_sql_mode database
 database/pool_timeout database
 database/retry_interval database
+database/slave_connection database
 database/sqlite_db database
 database/sqlite_synchronous database
 database/time_to_live database

tools/autogenerate-config-flagmappings/ceilometer.headers

@@ -3,5 +3,4 @@ collector collector
 events events
 exchange exchange
 inspector inspector
-notification notification
 nova_cells nova cells

tools/autogenerate-config-flagmappings/cinder.flagmappings

@@ -39,6 +39,7 @@ cinder_emc_config_file emc
 cinder_huawei_conf_file huawei
 cloned_volume_same_az zones
 compute_api_class common
+consistencygroup_api_class common
 control_exchange rpc
 coraid_esm_address coraid
 coraid_group coraid
@@ -245,6 +246,7 @@ qpid_sasl_mechanisms rpc
 qpid_tcp_nodelay rpc
 qpid_topology_version rpc
 qpid_username rpc
+quota_consistencygroups quota
 quota_driver quota
 quota_gigabytes quota
 quota_snapshots quota
@@ -409,6 +411,21 @@ zadara_vpsa_ip zadara
 zadara_vpsa_poolname zadara
 zadara_vpsa_port zadara
 zadara_vpsa_use_ssl zadara
+zfssa_initiator zfssa
+zfssa_initiator_group zfssa
+zfssa_initiator_password zfssa
+zfssa_initiator_user zfssa
+zfssa_lun_compression zfssa
+zfssa_lun_logbias zfssa
+zfssa_lun_sparse zfssa
+zfssa_lun_volblocksize zfssa
+zfssa_pool zfssa
+zfssa_project zfssa
+zfssa_target_group zfssa
+zfssa_target_interfaces zfssa
+zfssa_target_password zfssa
+zfssa_target_portal zfssa
+zfssa_target_user zfssa
 zoning_mode zoning
 BRCD_FABRIC_EXAMPLE/fc_fabric_address zoning_fabric
 BRCD_FABRIC_EXAMPLE/fc_fabric_password zoning_fabric

tools/autogenerate-config-flagmappings/cinder.headers

@@ -3,7 +3,6 @@ backups_ceph Ceph backup driver
 backups_swift Swift backup driver
 backups_tsm IBM Tivoli Storage Manager backup driver
 block-device block device
-compute Compute
 coraid Coraid AoE driver
 emc EMC
 eqlx Dell EqualLogic volume driver
@@ -27,11 +26,9 @@ nexenta_nfs Nexenta NFS driver
 nimble Nimble driver
 prophetstor_dpl ProphetStor Fibre Channel and iSCSi drivers
 pure Pure Storage driver
-quota quota
 san SAN
 san-solaris Solaris SAN
 scality Scality SOFS volume driver
-scheduler scheduler
 solidfire SolidFire driver
 storage storage
 storage_ceph Ceph storage
@@ -43,6 +40,7 @@ storwize IBM Storwise driver
 windows Windows
 xiv IBM XIV and DS8000 volume driver
 zadara Zadara Storage driver
+zfssa ZFS Storage Appliance iSCSI driver
 zones zones
 zoning zoning
 zoning_fabric zoning fabrics

tools/autogenerate-config-flagmappings/glance.flagmappings

@@ -126,17 +126,17 @@ registry_client_timeout registry
 registry_host registry
 registry_port registry
 rpc_backend amqp
-rpc_cast_timeout zmq
+rpc_cast_timeout zeromq
 rpc_conn_pool_size amqp
 rpc_response_timeout amqp
 rpc_thread_pool_size amqp
-rpc_zmq_bind_address zmq
+rpc_zmq_bind_address zeromq
-rpc_zmq_contexts zmq
+rpc_zmq_contexts zeromq
-rpc_zmq_host zmq
+rpc_zmq_host zeromq
-rpc_zmq_ipc_dir zmq
+rpc_zmq_ipc_dir zeromq
-rpc_zmq_matchmaker zmq
+rpc_zmq_matchmaker zeromq
-rpc_zmq_port zmq
+rpc_zmq_port zeromq
-rpc_zmq_topic_backlog zmq
+rpc_zmq_topic_backlog zeromq
 s3_store_access_key s3
 s3_store_bucket s3
 s3_store_bucket_url_format s3

tools/autogenerate-config-flagmappings/glance.headers

@@ -3,12 +3,8 @@ gridfs GridFS
 imagecache flagmappings
 matchmaker matchmaker
 paste paste
-policy policy
 profiler profiler
 rbd RBD
 registry registry
 s3 S3
 sheepdog Sheepdog
-testing testing
-wsgi WSGI
-zmq ZeroMQ

tools/autogenerate-config-flagmappings/heat.flagmappings

@@ -54,6 +54,7 @@ max_resources_per_stack quota
 max_stacks_per_tenant quota
 max_template_size quota
 memcached_servers auth_token
+networking_service common
 notification_driver amqp
 notification_topics amqp
 num_engine_workers api

tools/autogenerate-config-flagmappings/heat.headers

@@ -1,5 +1,4 @@
 cfn_api Cloudformation-compatible API
-clients clients
 clients_backends client backends
 clients_ceilometer ceilometer clients
 clients_cinder cinder clients

tools/autogenerate-config-flagmappings/keystone.flagmappings

@@ -13,15 +13,15 @@ debug debug
 default_log_levels logging
 default_publisher_id amqp
 domain_id_immutable api
-fake_rabbit rabbit
+fake_rabbit rabbitmq
 fatal_deprecations debug
 instance_format logging
 instance_uuid_format logging
-kombu_reconnect_delay rabbit
+kombu_reconnect_delay rabbitmq
-kombu_ssl_ca_certs rabbit
+kombu_ssl_ca_certs rabbitmq
-kombu_ssl_certfile rabbit
+kombu_ssl_certfile rabbitmq
-kombu_ssl_keyfile rabbit
+kombu_ssl_keyfile rabbitmq
-kombu_ssl_version rabbit
+kombu_ssl_version rabbitmq
 list_limit api
 log_config_append logging
 log_date_format logging
@@ -61,18 +61,18 @@ qpid_sasl_mechanisms qpid
 qpid_tcp_nodelay qpid
 qpid_topology_version qpid
 qpid_username qpid
-rabbit_ha_queues rabbit
+rabbit_ha_queues rabbitmq
-rabbit_host rabbit
+rabbit_host rabbitmq
-rabbit_hosts rabbit
+rabbit_hosts rabbitmq
-rabbit_login_method rabbit
+rabbit_login_method rabbitmq
-rabbit_max_retries rabbit
+rabbit_max_retries rabbitmq
-rabbit_password rabbit
+rabbit_password rabbitmq
-rabbit_port rabbit
+rabbit_port rabbitmq
-rabbit_retry_backoff rabbit
+rabbit_retry_backoff rabbitmq
-rabbit_retry_interval rabbit
+rabbit_retry_interval rabbitmq
-rabbit_use_ssl rabbit
+rabbit_use_ssl rabbitmq
-rabbit_userid rabbit
+rabbit_userid rabbitmq
-rabbit_virtual_host rabbit
+rabbit_virtual_host rabbitmq
 rpc_backend amqp
 rpc_cast_timeout amqp
 rpc_conn_pool_size amqp

tools/autogenerate-config-flagmappings/keystone.headers

@@ -11,8 +11,6 @@ mapping mapping
 memcache memcache
 oauth OAuth
 os_inherit os_inherit
-policy policy
-rabbit RabbitMQ
 revoke revoke
 security security
 stats stats

tools/autogenerate-config-flagmappings/neutron.flagmappings

@@ -244,6 +244,7 @@ CISCO_N1K/local_ip openvswitch_agent
 CISCO_N1K/network_node_policy_profile cisco
 CISCO_N1K/network_vlan_ranges cisco
 CISCO_N1K/poll_duration cisco
+CISCO_N1K/restrict_policy_profiles cisco
 CISCO_N1K/tenant_network_type cisco
 CISCO_N1K/tunnel_bridge cisco
 CISCO_N1K/vxlan_id_ranges cisco
@@ -517,6 +518,13 @@ keystone_authtoken/revocation_cache_time auth_token
 keystone_authtoken/signing_dir auth_token
 keystone_authtoken/token_cache_time auth_token
 l2pop/agent_boot_time ml2_l2pop
+l3_arista/l3_sync_interval l3_arista
+l3_arista/mlag_config l3_arista
+l3_arista/primary_l3_host l3_arista
+l3_arista/primary_l3_host_password l3_arista
+l3_arista/primary_l3_host_username l3_arista
+l3_arista/secondary_l3_host l3_arista
+l3_arista/use_vrf l3_arista
 matchmaker_redis/host redis
 matchmaker_redis/password redis
 matchmaker_redis/port redis
@@ -542,10 +550,10 @@ ml2_cisco/vlan_name_prefix cisco
 ml2_cisco_apic/apic_clear_node_profiles ml2_cisco_apic
 ml2_cisco_apic/apic_entity_profile ml2_cisco_apic
 ml2_cisco_apic/apic_function_profile ml2_cisco_apic
-ml2_cisco_apic/apic_host ml2_cisco_apic
+ml2_cisco_apic/apic_hosts ml2_cisco_apic
 ml2_cisco_apic/apic_node_profile ml2_cisco_apic
 ml2_cisco_apic/apic_password ml2_cisco_apic
-ml2_cisco_apic/apic_port ml2_cisco_apic
+ml2_cisco_apic/apic_use_ssl ml2_cisco_apic
 ml2_cisco_apic/apic_username ml2_cisco_apic
 ml2_cisco_apic/apic_vlan_ns_name ml2_cisco_apic
 ml2_cisco_apic/apic_vlan_range ml2_cisco_apic
@@ -577,9 +585,9 @@ ml2_type_gre/tunnel_id_ranges ml2_gre
 ml2_type_vlan/network_vlan_ranges ml2_vlan
 ml2_type_vxlan/vni_ranges ml2_vxlan
 ml2_type_vxlan/vxlan_group ml2_vxlan
-netscaler_driver/netscaler_ncc_password lbaas_netscalar
+netscaler_driver/netscaler_ncc_password lbaas_netscaler
-netscaler_driver/netscaler_ncc_uri lbaas_netscalar
+netscaler_driver/netscaler_ncc_uri lbaas_netscaler
-netscaler_driver/netscaler_ncc_username lbaas_netscalar
+netscaler_driver/netscaler_ncc_username lbaas_netscaler
 nvsd/nvsd_ip nvsd
 nvsd/nvsd_passwd nvsd
 nvsd/nvsd_port nvsd

tools/autogenerate-config-flagmappings/neutron.headers

@@ -3,7 +3,6 @@ bigswitch BigSwitch
 brocade Brocade
 cfg_agent cfg agent
 cisco Cisco
-compute Compute
 dhcp_agent DHCP agent
 dvr DVR
 embrane Embrane
@@ -12,10 +11,10 @@ fwaas FwaaS
 hyperv_agent HyperV agent
 ipv6_ra IPv6 router advertisement
 l3_agent L3 agent
+l3_arista Arista layer-3 service plug-in
 lbaas LBaaS
 lbaas_haproxy LBaaS haproxy
-# Rename option to netscaler
+lbaas_netscaler LBaaS Netscaler
-lbaas_netscalar LBaaS Netscaler
 lbaas_radware LBaaS Radware
 linuxbridge_agent Linux Bridge agent
 meta meta
@@ -47,14 +46,10 @@ nvsd NVSD driver
 opencontrail OpenContrail
 openvswitch_agent Open vSwitch agent
 plumgrid PLUMgrid
-policy policy
 quotas quotas
 ryu RYU
-scheduler scheduler
 sdnve SDN-VE
 securitygroups security groups
 sriov SR-IOV
-testing testing
 varmour vArmour
 vpn VPN
-wsgi WSGI

tools/autogenerate-config-flagmappings/shared.headers

@@ -3,19 +3,26 @@ api API
 auth authorization
 auth_token authorization token
 cinder cinder
+clients clients
 common common
+compute Compute
 database database
 debug debug
 glance glance
 logging logging
 notification notification
+policy policy
+profiler profiler
 qpid Qpid
 quota quota
 rabbitmq RabbitMQ
 redis Redis
 rpc RPC
+scheduler scheduler
 ssl SSL
 swift swift
+testing testing
 tripleo TripleO
 vmware VMware
+wsgi WSGI
 zeromq ZeroMQ

tools/autogenerate-config-flagmappings/trove.flagmappings

@@ -5,7 +5,6 @@ agent_heartbeat_time guestagent
 allowed_rpc_exception_modules rpc
 amqp_auto_delete amqp
 amqp_durable_queues amqp
-api_extensions_path api
 api_paste_config api
 backdoor_port debug
 backlog debug
@@ -22,6 +21,7 @@ backup_use_gzip_compression backup
 backup_use_openssl_encryption backup
 backup_use_snet backup
 backups_page_size backup
+bind_host api
 bind_port api
 black_list_regex api
 block_device_mapping volume
@@ -201,6 +201,7 @@ trove_security_groups_support api
 trove_volume_support volume
 update_status_on_fail taskmanager
 usage_sleep_time guestagent taskmanager
+usage_timeout common
 use_heat taskmanager
 use_nova_server_config_drive taskmanager
 use_nova_server_volume taskmanager
@@ -219,7 +220,6 @@ cassandra/mount_point db_cassandra
 cassandra/replication_strategy db_cassandra
 cassandra/tcp_ports db_cassandra
 cassandra/udp_ports db_cassandra
-cassandra/usage_timeout db_cassandra
 cassandra/volume_support db_cassandra
 couchbase/backup_namespace db_couchbase
 couchbase/backup_strategy db_couchbase
@@ -230,7 +230,6 @@ couchbase/restore_namespace db_couchbase
 couchbase/root_on_create db_couchbase
 couchbase/tcp_ports db_couchbase
 couchbase/udp_ports db_couchbase
-couchbase/usage_timeout db_couchbase
 couchbase/volume_support db_couchbase
 keystone_authtoken/admin_password auth_token
 keystone_authtoken/admin_tenant_name auth_token
@@ -271,7 +270,6 @@ mongodb/mount_point db_mongodb
 mongodb/replication_strategy db_mongodb
 mongodb/tcp_ports db_mongodb
 mongodb/udp_ports db_mongodb
-mongodb/usage_timeout db_mongodb
 mongodb/volume_support db_mongodb
 mysql/backup_namespace db_mysql
 mysql/backup_strategy db_mysql
@@ -307,7 +305,6 @@ redis/mount_point db_redis
 redis/replication_strategy db_redis
 redis/tcp_ports db_redis
 redis/udp_ports db_redis
-redis/usage_timeout db_redis
 redis/volume_support db_redis
 rpc_notifier2/topics rpc
 secure_messages/enabled rpc

tools/autogenerate-config-flagmappings/trove.headers

@@ -1,6 +1,4 @@
 backup backup
-clients clients
-compute Compute
 db_cassandra Cassandra database
 db_couchbase Couchbase database
 db_mongodb MongoDB database