diff --git a/doc/common/tables/ceilometer-alarm.xml b/doc/common/tables/ceilometer-alarm.xml
index ff11d19632..75c70d4871 100644
--- a/doc/common/tables/ceilometer-alarm.xml
+++ b/doc/common/tables/ceilometer-alarm.xml
@@ -27,7 +27,7 @@
| partition_rpc_topic = alarm_partition_coordination |
- (StrOpt) The topic that ceilometer uses for alarm partition coordination messages. |
+ (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. |
| project_alarm_quota = None |
diff --git a/doc/common/tables/cinder-common.xml b/doc/common/tables/cinder-common.xml
index 1ccb846569..19d55f3edd 100644
--- a/doc/common/tables/cinder-common.xml
+++ b/doc/common/tables/cinder-common.xml
@@ -117,6 +117,10 @@
service_down_time = 60 |
(IntOpt) Maximum time since last check-in for a service to be considered up |
+
+ | ssh_hosts_key_file = $state_path/ssh_known_hosts |
+ (StrOpt) File containing SSH host keys for the systems with which Cinder needs to communicate. OPTIONAL: Default=$state_path/known_hosts |
+
| state_path = /var/lib/cinder |
(StrOpt) Top-level directory for maintaining cinder's state |
@@ -125,6 +129,10 @@
storage_availability_zone = nova |
(StrOpt) Availability zone of this node |
+
+ | strict_ssh_host_key_policy = False |
+ (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 |
+
| tcp_keepalive = True |
(BoolOpt) Sets the value of TCP_KEEPALIVE (True/False) for each server socket. |
diff --git a/doc/common/tables/cinder-datera.xml b/doc/common/tables/cinder-datera.xml
new file mode 100644
index 0000000000..382a36c4c8
--- /dev/null
+++ b/doc/common/tables/cinder-datera.xml
@@ -0,0 +1,46 @@
+
+
+
+
+ Description of Datera volume driver configuration options
+
+
+
+
+ | Configuration option = Default value |
+ Description |
+
+
+
+
+ | [DEFAULT] |
+
+
+ | datera_api_port = 7717 |
+ (StrOpt) Datera API port. |
+
+
+ | datera_api_token = None |
+ (StrOpt) Datera API token. |
+
+
+ | datera_api_version = 1 |
+ (StrOpt) Datera API version. |
+
+
+ | datera_num_replicas = 3 |
+ (StrOpt) Number of replicas to create of an inode. |
+
+
+ | driver_client_cert = None |
+ (StrOpt) The path to the client certificate for verification, if the driver supports it. |
+
+
+ | driver_client_cert_key = None |
+ (StrOpt) The path to the client certificate key for verification, if the driver supports it. |
+
+
+
+
diff --git a/doc/common/tables/cinder-fujitsu_eternus_dx.xml b/doc/common/tables/cinder-fujitsu_eternus_dx.xml
new file mode 100644
index 0000000000..e2e224047b
--- /dev/null
+++ b/doc/common/tables/cinder-fujitsu_eternus_dx.xml
@@ -0,0 +1,26 @@
+
+
+
+
+ Description of Fujitsu ETERNUS DX volume driver configuration options
+
+
+
+
+ | Configuration option = Default value |
+ Description |
+
+
+
+
+ | [DEFAULT] |
+
+
+ | cinder_smis_config_file = /etc/cinder/cinder_fujitsu_eternus_dx.xml |
+ (StrOpt) The configuration file for the Cinder SMI-S driver |
+
+
+
+
diff --git a/doc/common/tables/cinder-hitachi.xml b/doc/common/tables/cinder-hitachi.xml
index 2e5fe90cc1..ee8e09d3e8 100644
--- a/doc/common/tables/cinder-hitachi.xml
+++ b/doc/common/tables/cinder-hitachi.xml
@@ -37,6 +37,10 @@
hitachi_auth_user = HBSD-CHAP-user |
(StrOpt) iSCSI authentication username |
+
+ | hitachi_copy_check_interval = 3 |
+ (IntOpt) Interval to check copy |
+
| hitachi_copy_speed = 3 |
(IntOpt) Copy speed of storage system |
diff --git a/doc/common/tables/cinder-quota.xml b/doc/common/tables/cinder-quota.xml
index 4bd37ee265..df49519867 100644
--- a/doc/common/tables/cinder-quota.xml
+++ b/doc/common/tables/cinder-quota.xml
@@ -21,6 +21,14 @@
max_age = 0 |
(IntOpt) Number of seconds between subsequent usage refreshes |
+
+ | quota_backup_gigabytes = 1000 |
+ (IntOpt) Total amount of storage, in gigabytes, allowed for backups per project |
+
+
+ | quota_backups = 10 |
+ (IntOpt) Number of volume backups allowed per project |
+
| quota_consistencygroups = 10 |
(IntOpt) Number of consistencygroups allowed per project |
diff --git a/doc/common/tables/neutron-common.xml b/doc/common/tables/neutron-common.xml
index 0e91d706df..a353acbc02 100644
--- a/doc/common/tables/neutron-common.xml
+++ b/doc/common/tables/neutron-common.xml
@@ -73,6 +73,18 @@
ca_certs = None |
(StrOpt) CA certificates |
+
+ | check_child_processes = False |
+ (BoolOpt) Periodically check child processes |
+
+
+ | check_child_processes_action = respawn |
+ (StrOpt) Action to be executed when a child process dies |
+
+
+ | check_child_processes_interval = 60 |
+ (IntOpt) Interval between checks of child process liveness (seconds) |
+
| core_plugin = None |
(StrOpt) The core plugin Neutron will use |
diff --git a/doc/common/tables/neutron-ml2_cisco.xml b/doc/common/tables/neutron-ml2_cisco.xml
index 25ecab8718..086cd2ac82 100644
--- a/doc/common/tables/neutron-ml2_cisco.xml
+++ b/doc/common/tables/neutron-ml2_cisco.xml
@@ -107,25 +107,6 @@
root_helper = sudo /usr/local/bin/neutron-rootwrap /etc/neutron/rootwrap.conf |
(StrOpt) Setup root helper as rootwrap or sudo |
-
- | [ml2_cisco_dfa] |
-
-
- | dcnm_ip = 0.0.0.0 |
- (StrOpt) IP address of DCNM. |
-
-
- | dcnm_password = password |
- (StrOpt) Login password for DCNM. |
-
-
- | dcnm_user = user |
- (StrOpt) User login name for DCNM. |
-
-
- | gateway_mac = 00:00:DE:AD:BE:EF |
- (StrOpt) Gateway mac address when using proxy mode. |
-
diff --git a/doc/common/tables/neutron-ml2_ofa.xml b/doc/common/tables/neutron-ml2_ofa.xml
index bc4b99fbea..fa3f8ca29c 100644
--- a/doc/common/tables/neutron-ml2_ofa.xml
+++ b/doc/common/tables/neutron-ml2_ofa.xml
@@ -40,6 +40,10 @@
get_datapath_retry_times = 60 |
(IntOpt) Number of seconds to retry acquiring an Open vSwitch datapath |
+
+ | physical_interface_mappings = |
+ (ListOpt) List of <physical_network>:<physical_interface> |
+
diff --git a/doc/common/tables/neutron-openvswitch_agent.xml b/doc/common/tables/neutron-openvswitch_agent.xml
index 79ea4648bd..79d3db1bfd 100644
--- a/doc/common/tables/neutron-openvswitch_agent.xml
+++ b/doc/common/tables/neutron-openvswitch_agent.xml
@@ -80,7 +80,7 @@
| bridge_mappings = |
- (ListOpt) List of <physical_network>:<bridge> |
+ (ListOpt) List of <physical_network>:<bridge>. Deprecated for ofagent. |
| enable_tunneling = False |
diff --git a/doc/common/tables/nova-libvirt.xml b/doc/common/tables/nova-libvirt.xml
index d206e14868..be29cba664 100644
--- a/doc/common/tables/nova-libvirt.xml
+++ b/doc/common/tables/nova-libvirt.xml
@@ -60,6 +60,10 @@
image_info_filename_pattern = $instances_path/$image_cache_subdirectory_name/%(image)s.info |
(StrOpt) Allows image information files to be stored in non-standard locations |
+
+ | mem_stats_period_seconds = 10 |
+ (IntOpt) A number of seconds to memory usage statistics period. Zero or negative value mean to disable memory usage statistics. |
+
| remove_unused_kernels = False |
(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. |
diff --git a/doc/common/tables/nova-volumes.xml b/doc/common/tables/nova-volumes.xml
index 26ebcf0215..249ac81ef1 100644
--- a/doc/common/tables/nova-volumes.xml
+++ b/doc/common/tables/nova-volumes.xml
@@ -25,38 +25,6 @@
block_device_allocate_retries_interval = 3 |
(IntOpt) Waiting time interval (seconds) between block device allocation retries on failures |
-
- | cinder_api_insecure = False |
- (BoolOpt) Allow to perform insecure SSL requests to cinder |
-
-
- | cinder_ca_certificates_file = None |
- (StrOpt) Location of ca certificates file to use for cinder client requests. |
-
-
- | cinder_catalog_info = volume:cinder:publicURL |
- (StrOpt) Info to match when looking for cinder in the service catalog. Format is: separated values of the form: <service_type>:<service_name>:<endpoint_type> |
-
-
- | cinder_cross_az_attach = True |
- (BoolOpt) Allow attach between instance and volume in different availability zones. |
-
-
- | cinder_endpoint_template = None |
- (StrOpt) Override service catalog lookup with template for cinder endpoint e.g. http://localhost:8776/v1/%(project_id)s |
-
-
- | cinder_http_retries = 3 |
- (IntOpt) Number of cinderclient retries on failed http calls |
-
-
- | cinder_http_timeout = None |
- (IntOpt) HTTP inactivity timeout (in seconds) |
-
-
- | os_region_name = None |
- (StrOpt) Region name of this node |
-
| volume_api_class = nova.volume.cinder.API |
(StrOpt) The full class name of the volume API class to use |
@@ -76,6 +44,41 @@
volume_driver = nova.virt.baremetal.volume_driver.LibvirtVolumeDriver |
(StrOpt) Baremetal volume driver. |
+
+ | [cinder] |
+
+
+ | api_insecure = False |
+ (BoolOpt) Allow to perform insecure SSL requests to cinder |
+
+
+ | ca_certificates_file = None |
+ (StrOpt) Location of ca certificates file to use for cinder client requests. |
+
+
+ | catalog_info = volume:cinder:publicURL |
+ (StrOpt) Info to match when looking for cinder in the service catalog. Format is: separated values of the form: <service_type>:<service_name>:<endpoint_type> |
+
+
+ | cross_az_attach = True |
+ (BoolOpt) Allow attach between instance and volume in different availability zones. |
+
+
+ | endpoint_template = None |
+ (StrOpt) Override service catalog lookup with template for cinder endpoint e.g. http://localhost:8776/v1/%(project_id)s |
+
+
+ | http_retries = 3 |
+ (IntOpt) Number of cinderclient retries on failed http calls |
+
+
+ | http_timeout = None |
+ (IntOpt) HTTP inactivity timeout (in seconds) |
+
+
+ | os_region_name = None |
+ (StrOpt) Region name of this node |
+
| [hyperv] |
diff --git a/doc/common/tables/sahara-amqp.xml b/doc/common/tables/sahara-amqp.xml
index dce869eaf5..a24a65a506 100644
--- a/doc/common/tables/sahara-amqp.xml
+++ b/doc/common/tables/sahara-amqp.xml
@@ -29,6 +29,14 @@
notification_driver = [] |
(MultiStrOpt) Driver or drivers to handle sending notifications. |
+
+ | notification_level = INFO |
+ (StrOpt) Notification level for outgoing notifications |
+
+
+ | notification_publisher_id = None |
+ (StrOpt) Notification publisher_id for outgoing notifications |
+
| notification_topics = notifications |
(ListOpt) AMQP topic used for OpenStack notifications. |
diff --git a/doc/common/tables/sahara-common.xml b/doc/common/tables/sahara-common.xml
index 39875dc668..dd6961807d 100644
--- a/doc/common/tables/sahara-common.xml
+++ b/doc/common/tables/sahara-common.xml
@@ -51,6 +51,10 @@
(BoolOpt) Enables four-level topology for data locality.
Works only if corresponding plugin supports such mode. |
+
+ | enable_notifications = False |
+ (BoolOpt) Enables sending notifications to Ceilometer |
+
| global_remote_threshold = 100 |
(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. |
diff --git a/doc/config-reference/block-storage/section_misc.xml b/doc/config-reference/block-storage/section_misc.xml
index 23a5a27759..a0633f77e1 100644
--- a/doc/config-reference/block-storage/section_misc.xml
+++ b/doc/config-reference/block-storage/section_misc.xml
@@ -46,5 +46,7 @@
+
+
diff --git a/tools/autogenerate-config-flagmappings/cinder.flagmappings b/tools/autogenerate-config-flagmappings/cinder.flagmappings
index bf77b4f13b..071fb95249 100644
--- a/tools/autogenerate-config-flagmappings/cinder.flagmappings
+++ b/tools/autogenerate-config-flagmappings/cinder.flagmappings
@@ -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
diff --git a/tools/autogenerate-config-flagmappings/cinder.headers b/tools/autogenerate-config-flagmappings/cinder.headers
index 35b8ca4360..2e0b0efab3 100644
--- a/tools/autogenerate-config-flagmappings/cinder.headers
+++ b/tools/autogenerate-config-flagmappings/cinder.headers
@@ -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
diff --git a/tools/autogenerate-config-flagmappings/neutron.flagmappings b/tools/autogenerate-config-flagmappings/neutron.flagmappings
index 2d123b3266..df2dcf48d1 100644
--- a/tools/autogenerate-config-flagmappings/neutron.flagmappings
+++ b/tools/autogenerate-config-flagmappings/neutron.flagmappings
@@ -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
diff --git a/tools/autogenerate-config-flagmappings/nova.flagmappings b/tools/autogenerate-config-flagmappings/nova.flagmappings
index 07178fd699..8f050a17bd 100644
--- a/tools/autogenerate-config-flagmappings/nova.flagmappings
+++ b/tools/autogenerate-config-flagmappings/nova.flagmappings
@@ -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
diff --git a/tools/autogenerate-config-flagmappings/sahara.flagmappings b/tools/autogenerate-config-flagmappings/sahara.flagmappings
index ed8e7f6e5e..b672cda051 100644
--- a/tools/autogenerate-config-flagmappings/sahara.flagmappings
+++ b/tools/autogenerate-config-flagmappings/sahara.flagmappings
@@ -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