openstack
/
openstack-manuals
Code Issues Proposed changes

Regenerate tables (without swift, trove) for Juno3 

Regenerate config tables for Juno3.

Note: "Cisco DFA ML2 Mechanism Driver" was reverted, the deletion of the
options is fine.

Change-Id: I5af1de00595578f18c2c1974bde71dd1a864ad88
Closes-Bug: #1364520
Closes-Bug: #1365826
Closes-Bug: #1365649
Closes-Bug: #1359334
This commit is contained in:
Andreas Jaeger 2014-09-05 16:20:31 +02:00
parent 0a9a5c25c1
commit 5f0adaf37e
20 changed files with 193 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/common/tables/ceilometer-alarm.xml
View File

@ -27,7 +27,7 @@
</tr>
<tr>
<td>partition_rpc_topic = alarm_partition_coordination</td>
<td>(StrOpt) The topic that ceilometer uses for alarm partition coordination messages.</td>
<td>(StrOpt) The topic that ceilometer uses for alarm partition coordination messages. DEPRECATED: RPC-based partitionedalarm evaluation service will be removed in Kilo in favour of the default alarm evaluation service using tooz for partitioning.</td>
</tr>
<tr>
<td>project_alarm_quota = None</td>

8
doc/common/tables/cinder-common.xml
View File

@ -117,6 +117,10 @@
<td>service_down_time = 60</td>
<td>(IntOpt) Maximum time since last check-in for a service to be considered up</td>
</tr>
<tr>
<td>ssh_hosts_key_file = $state_path/ssh_known_hosts</td>
<td>(StrOpt) File containing SSH host keys for the systems with which Cinder needs to communicate. OPTIONAL: Default=$state_path/known_hosts</td>
</tr>
<tr>
<td>state_path = /var/lib/cinder</td>
<td>(StrOpt) Top-level directory for maintaining cinder's state</td>
@ -125,6 +129,10 @@
<td>storage_availability_zone = nova</td>
<td>(StrOpt) Availability zone of this node</td>
</tr>
<tr>
<td>strict_ssh_host_key_policy = False</td>
<td>(BoolOpt) Option to enable strict host key checking. When set to "True" Cinder will only connect to systems with a host key present in the configured "ssh_hosts_key_file". When set to "False" the host key will be saved upon first connection and used for subsequent connections. Default=False</td>
</tr>
<tr>
<td>tcp_keepalive = True</td>
<td>(BoolOpt) Sets the value of TCP_KEEPALIVE (True/False) for each server socket.</td>

46
doc/common/tables/cinder-datera.xml Normal file
View File

@ -0,0 +1,46 @@
<?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_datera">
<caption>Description of Datera volume 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>datera_api_port = 7717</td>
<td>(StrOpt) Datera API port.</td>
</tr>
<tr>
<td>datera_api_token = None</td>
<td>(StrOpt) Datera API token.</td>
</tr>
<tr>
<td>datera_api_version = 1</td>
<td>(StrOpt) Datera API version.</td>
</tr>
<tr>
<td>datera_num_replicas = 3</td>
<td>(StrOpt) Number of replicas to create of an inode.</td>
</tr>
<tr>
<td>driver_client_cert = None</td>
<td>(StrOpt) The path to the client certificate for verification, if the driver supports it.</td>
</tr>
<tr>
<td>driver_client_cert_key = None</td>
<td>(StrOpt) The path to the client certificate key for verification, if the driver supports it.</td>
</tr>
</tbody>
</table>
</para>

26
doc/common/tables/cinder-fujitsu_eternus_dx.xml Normal file
View File

@ -0,0 +1,26 @@
<?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_fujitsu_eternus_dx">
<caption>Description of Fujitsu ETERNUS DX volume 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>cinder_smis_config_file = /etc/cinder/cinder_fujitsu_eternus_dx.xml</td>
<td>(StrOpt) The configuration file for the Cinder SMI-S driver</td>
</tr>
</tbody>
</table>
</para>

4
doc/common/tables/cinder-hitachi.xml
View File

@ -37,6 +37,10 @@
<td>hitachi_auth_user = HBSD-CHAP-user</td>
<td>(StrOpt) iSCSI authentication username</td>
</tr>
<tr>
<td>hitachi_copy_check_interval = 3</td>
<td>(IntOpt) Interval to check copy</td>
</tr>
<tr>
<td>hitachi_copy_speed = 3</td>
<td>(IntOpt) Copy speed of storage system</td>

8
doc/common/tables/cinder-quota.xml
View File

@ -21,6 +21,14 @@
<td>max_age = 0</td>
<td>(IntOpt) Number of seconds between subsequent usage refreshes</td>
</tr>
<tr>
<td>quota_backup_gigabytes = 1000</td>
<td>(IntOpt) Total amount of storage, in gigabytes, allowed for backups per project</td>
</tr>
<tr>
<td>quota_backups = 10</td>
<td>(IntOpt) Number of volume backups allowed per project</td>
</tr>
<tr>
<td>quota_consistencygroups = 10</td>
<td>(IntOpt) Number of consistencygroups allowed per project</td>

12
doc/common/tables/neutron-common.xml
View File

@ -73,6 +73,18 @@
<td>ca_certs = None</td>
<td>(StrOpt) CA certificates</td>
</tr>
<tr>
<td>check_child_processes = False</td>
<td>(BoolOpt) Periodically check child processes</td>
</tr>
<tr>
<td>check_child_processes_action = respawn</td>
<td>(StrOpt) Action to be executed when a child process dies</td>
</tr>
<tr>
<td>check_child_processes_interval = 60</td>
<td>(IntOpt) Interval between checks of child process liveness (seconds)</td>
</tr>
<tr>
<td>core_plugin = None</td>
<td>(StrOpt) The core plugin Neutron will use</td>

19
doc/common/tables/neutron-ml2_cisco.xml
View File

@ -107,25 +107,6 @@
<td>root_helper = sudo /usr/local/bin/neutron-rootwrap /etc/neutron/rootwrap.conf</td>
<td>(StrOpt) Setup root helper as rootwrap or sudo</td>
</tr>
<tr>
<th colspan="2">[ml2_cisco_dfa]</th>
</tr>
<tr>
<td>dcnm_ip = 0.0.0.0</td>
<td>(StrOpt) IP address of DCNM.</td>
</tr>
<tr>
<td>dcnm_password = password</td>
<td>(StrOpt) Login password for DCNM.</td>
</tr>
<tr>
<td>dcnm_user = user</td>
<td>(StrOpt) User login name for DCNM.</td>
</tr>
<tr>
<td>gateway_mac = 00:00:DE:AD:BE:EF</td>
<td>(StrOpt) Gateway mac address when using proxy mode.</td>
</tr>
</tbody>
</table>
</para>

4
doc/common/tables/neutron-ml2_ofa.xml
View File

@ -40,6 +40,10 @@
<td>get_datapath_retry_times = 60</td>
<td>(IntOpt) Number of seconds to retry acquiring an Open vSwitch datapath</td>
</tr>
<tr>
<td>physical_interface_mappings = </td>
<td>(ListOpt) List of &lt;physical_network&gt;:&lt;physical_interface&gt;</td>
</tr>
</tbody>
</table>
</para>

2
doc/common/tables/neutron-openvswitch_agent.xml
View File

@ -80,7 +80,7 @@
</tr>
<tr>
<td>bridge_mappings = </td>
<td>(ListOpt) List of &lt;physical_network&gt;:&lt;bridge&gt;</td>
<td>(ListOpt) List of &lt;physical_network&gt;:&lt;bridge&gt;. Deprecated for ofagent.</td>
</tr>
<tr>
<td>enable_tunneling = False</td>

4
doc/common/tables/nova-libvirt.xml
View File

@ -60,6 +60,10 @@
<td>image_info_filename_pattern = $instances_path/$image_cache_subdirectory_name/%(image)s.info</td>
<td>(StrOpt) Allows image information files to be stored in non-standard locations</td>
</tr>
<tr>
<td>mem_stats_period_seconds = 10</td>
<td>(IntOpt) A number of seconds to memory usage statistics period. Zero or negative value mean to disable memory usage statistics.</td>
</tr>
<tr>
<td>remove_unused_kernels = False</td>
<td>(BoolOpt) Should unused kernel images be removed? This is only safe to enable if all compute nodes have been updated to support this option. This will be enabled by default in future.</td>

67
doc/common/tables/nova-volumes.xml
View File

@ -25,38 +25,6 @@
<td>block_device_allocate_retries_interval = 3</td>
<td>(IntOpt) Waiting time interval (seconds) between block device allocation retries on failures</td>
</tr>
<tr>
<td>cinder_api_insecure = False</td>
<td>(BoolOpt) Allow to perform insecure SSL requests to cinder</td>
</tr>
<tr>
<td>cinder_ca_certificates_file = None</td>
<td>(StrOpt) Location of ca certificates file to use for cinder client requests.</td>
</tr>
<tr>
<td>cinder_catalog_info = volume:cinder:publicURL</td>
<td>(StrOpt) Info to match when looking for cinder in the service catalog. Format is: separated values of the form: &lt;service_type&gt;:&lt;service_name&gt;:&lt;endpoint_type&gt;</td>
</tr>
<tr>
<td>cinder_cross_az_attach = True</td>
<td>(BoolOpt) Allow attach between instance and volume in different availability zones.</td>
</tr>
<tr>
<td>cinder_endpoint_template = None</td>
<td>(StrOpt) Override service catalog lookup with template for cinder endpoint e.g. http://localhost:8776/v1/%(project_id)s</td>
</tr>
<tr>
<td>cinder_http_retries = 3</td>
<td>(IntOpt) Number of cinderclient retries on failed http calls</td>
</tr>
<tr>
<td>cinder_http_timeout = None</td>
<td>(IntOpt) HTTP inactivity timeout (in seconds)</td>
</tr>
<tr>
<td>os_region_name = None</td>
<td>(StrOpt) Region name of this node</td>
</tr>
<tr>
<td>volume_api_class = nova.volume.cinder.API</td>
<td>(StrOpt) The full class name of the volume API class to use</td>
@ -76,6 +44,41 @@
<td>volume_driver = nova.virt.baremetal.volume_driver.LibvirtVolumeDriver</td>
<td>(StrOpt) Baremetal volume driver.</td>
</tr>
<tr>
<th colspan="2">[cinder]</th>
</tr>
<tr>
<td>api_insecure = False</td>
<td>(BoolOpt) Allow to perform insecure SSL requests to cinder</td>
</tr>
<tr>
<td>ca_certificates_file = None</td>
<td>(StrOpt) Location of ca certificates file to use for cinder client requests.</td>
</tr>
<tr>
<td>catalog_info = volume:cinder:publicURL</td>
<td>(StrOpt) Info to match when looking for cinder in the service catalog. Format is: separated values of the form: &lt;service_type&gt;:&lt;service_name&gt;:&lt;endpoint_type&gt;</td>
</tr>
<tr>
<td>cross_az_attach = True</td>
<td>(BoolOpt) Allow attach between instance and volume in different availability zones.</td>
</tr>
<tr>
<td>endpoint_template = None</td>
<td>(StrOpt) Override service catalog lookup with template for cinder endpoint e.g. http://localhost:8776/v1/%(project_id)s</td>
</tr>
<tr>
<td>http_retries = 3</td>
<td>(IntOpt) Number of cinderclient retries on failed http calls</td>
</tr>
<tr>
<td>http_timeout = None</td>
<td>(IntOpt) HTTP inactivity timeout (in seconds)</td>
</tr>
<tr>
<td>os_region_name = None</td>
<td>(StrOpt) Region name of this node</td>
</tr>
<tr>
<th colspan="2">[hyperv]</th>
</tr>

8
doc/common/tables/sahara-amqp.xml
View File

@ -29,6 +29,14 @@
<td>notification_driver = []</td>
<td>(MultiStrOpt) Driver or drivers to handle sending notifications.</td>
</tr>
<tr>
<td>notification_level = INFO</td>
<td>(StrOpt) Notification level for outgoing notifications</td>
</tr>
<tr>
<td>notification_publisher_id = None</td>
<td>(StrOpt) Notification publisher_id for outgoing notifications</td>
</tr>
<tr>
<td>notification_topics = notifications</td>
<td>(ListOpt) AMQP topic used for OpenStack notifications.</td>

4
doc/common/tables/sahara-common.xml
View File

@ -51,6 +51,10 @@
<td>(BoolOpt) Enables four-level topology for data locality.
Works only if corresponding plugin supports such mode.</td>
</tr>
<tr>
<td>enable_notifications = False</td>
<td>(BoolOpt) Enables sending notifications to Ceilometer</td>
</tr>
<tr>
<td>global_remote_threshold = 100</td>
<td>(IntOpt) Maximum number of remote operations that will be running at the same time. Note that each remote operation requires its own process to run.</td>

2
doc/config-reference/block-storage/section_misc.xml
View File

@ -46,5 +46,7 @@
<xi:include href="../../common/tables/cinder-fusionio.xml"/>
<xi:include href="../../common/tables/cinder-hitachi.xml"/>
<xi:include href="../../common/tables/cinder-ibmnas.xml"/>
<xi:include href="../../common/tables/cinder-datera.xml"/>
<xi:include href="../../common/tables/cinder-fujitsu_eternus_dx.xml"/>
</section>

13
tools/autogenerate-config-flagmappings/cinder.flagmappings
View File

@ -37,6 +37,7 @@ backup_tsm_volume_prefix backups_tsm
capacity_weight_multiplier storage
cinder_emc_config_file emc
cinder_huawei_conf_file huawei
cinder_smis_config_file fujitsu_eternus_dx
cloned_volume_same_az zones
compute_api_class common
consistencygroup_api_class common
@ -46,6 +47,10 @@ coraid_group coraid
coraid_password coraid
coraid_repository_key coraid
coraid_user coraid
datera_api_port datera
datera_api_token datera
datera_api_version datera
datera_num_replicas datera
db_backend database
db_driver database
debug logging
@ -57,6 +62,8 @@ destroy_empty_storage_group emc
disable_process_locking common
dpl_pool prophetstor_dpl
dpl_port prophetstor_dpl
driver_client_cert datera
driver_client_cert_key datera
enable_new_services common
enable_v1_api api
enable_v2_api api
@ -103,7 +110,7 @@ hitachi_async_copy_check_interval hitachi
hitachi_auth_method hitachi
hitachi_auth_password hitachi
hitachi_auth_user hitachi
hitachi_copy_check_interval
hitachi_copy_check_interval hitachi
hitachi_copy_speed hitachi
hitachi_default_copy_method hitachi
hitachi_group_range hitachi
@ -271,6 +278,8 @@ qpid_sasl_mechanisms rpc
qpid_tcp_nodelay rpc
qpid_topology_version rpc
qpid_username rpc
quota_backup_gigabytes quota
quota_backups quota
quota_consistencygroups quota
quota_driver quota
quota_gigabytes quota
@ -344,6 +353,7 @@ sf_emulate_512 solidfire
snapshot_name_template backups
snapshot_same_host backups
ssh_conn_timeout san
ssh_hosts_key_file common
ssh_max_pool_conn san
ssh_min_pool_conn san
ssl_ca_file ca
@ -370,6 +380,7 @@ storwize_svc_vol_iogrp storwize
storwize_svc_vol_rsize storwize
storwize_svc_vol_warning storwize
storwize_svc_volpool_name storwize
strict_ssh_host_key_policy common
swift_catalog_info backups_swift
syslog_log_facility logging
tcp_keepalive common

2
tools/autogenerate-config-flagmappings/cinder.headers
View File

@ -4,8 +4,10 @@ backups_swift Swift backup driver
backups_tsm IBM Tivoli Storage Manager backup driver
block-device block device
coraid Coraid AoE driver
datera Datera volume driver
emc EMC
eqlx Dell EqualLogic volume driver
fujitsu_eternus_dx Fujitsu ETERNUS DX volume driver
fusionio Fusion-io driver
hds-hnas HDS HNAS iSCSI and NFS driver
hds-hus HDS HUS iSCSI driver

8
tools/autogenerate-config-flagmappings/neutron.flagmappings
View File

@ -25,6 +25,9 @@ base_mac common
bind_host common
bind_port common
ca_certs common
check_child_processes common
check_child_processes_action common
check_child_processes_interval common
control_exchange rpc
core_plugin common
ctl_cert common
@ -218,6 +221,7 @@ AGENT/local_network_vswitch hyperv_agent
AGENT/metrics_max_retries hyperv_agent
AGENT/minimize_polling openvswitch_agent
AGENT/ovsdb_monitor_respawn_interval openvswitch_agent
AGENT/physical_interface_mappings ml2_ofa
AGENT/physical_network_vswitch_mappings hyperv_agent
AGENT/polling_interval hyperv_agent
AGENT/report_interval metering_agent
@ -585,10 +589,6 @@ ml2_cisco_apic/apic_vlan_ns_name ml2_cisco
ml2_cisco_apic/apic_vlan_range ml2_cisco
ml2_cisco_apic/apic_vpc_pairs ml2_cisco
ml2_cisco_apic/root_helper ml2_cisco
ml2_cisco_dfa/dcnm_ip ml2_cisco
ml2_cisco_dfa/dcnm_password ml2_cisco
ml2_cisco_dfa/dcnm_user ml2_cisco
ml2_cisco_dfa/gateway_mac ml2_cisco
ml2_fslsdn/crd_api_insecure ml2_fslsdn
ml2_fslsdn/crd_auth_strategy ml2_fslsdn
ml2_fslsdn/crd_auth_url ml2_fslsdn

17
tools/autogenerate-config-flagmappings/nova.flagmappings
View File

@ -22,13 +22,6 @@ ca_file ca
ca_path ca
cert_manager ca
cert_topic ca
cinder_api_insecure volumes
cinder_ca_certificates_file volumes
cinder_catalog_info volumes
cinder_cross_az_attach volumes
cinder_endpoint_template volumes
cinder_http_retries volumes
cinder_http_timeout volumes
cnt_vpn_clients network
compute_available_monitors compute
compute_driver compute
@ -217,7 +210,6 @@ notify_on_state_change common
novncproxy_base_url vnc
null_kernel api
num_networks network
os_region_name volumes
osapi_compute_ext_list api
osapi_compute_extension api
osapi_compute_link_prefix api
@ -452,6 +444,14 @@ cells/scheduler_retries scheduler
cells/scheduler_retry_delay scheduler
cells/scheduler_weight_classes scheduler
cells/topic cells
cinder/api_insecure volumes
cinder/ca_certificates_file volumes
cinder/catalog_info volumes
cinder/cross_az_attach volumes
cinder/endpoint_template volumes
cinder/http_retries volumes
cinder/http_timeout volumes
cinder/os_region_name volumes
conductor/manager conductor
conductor/topic conductor
conductor/use_local conductor
@ -554,6 +554,7 @@ libvirt/iser_use_multipath hypervisor
libvirt/live_migration_bandwidth livemigration
libvirt/live_migration_flag livemigration
libvirt/live_migration_uri livemigration
libvirt/mem_stats_period_seconds libvirt
libvirt/nfs_mount_options volumes
libvirt/nfs_mount_point_base volumes
libvirt/num_aoe_discover_tries volumes

3
tools/autogenerate-config-flagmappings/sahara.flagmappings
View File

@ -10,6 +10,7 @@ detach_volume_timeout common
disable_process_locking debug
enable_data_locality common
enable_hypervisor_awareness common
enable_notifications common
fake_rabbit debug
fatal_deprecations logging
global_remote_threshold common
@ -41,6 +42,8 @@ memcached_servers common
min_transient_cluster_active_time common
node_domain common
notification_driver amqp
notification_level amqp
notification_publisher_id amqp
notification_topics amqp
os_region_name common
periodic_enable common