diff --git a/doc/common/tables/ceilometer-auth.xml b/doc/common/tables/ceilometer-auth.xml
index 228c8a1e7a..2bfeb4930b 100644
--- a/doc/common/tables/ceilometer-auth.xml
+++ b/doc/common/tables/ceilometer-auth.xml
@@ -137,35 +137,35 @@
| (BoolOpt) Disables X.509 certificate validation when an SSL connection to Identity Service is established. |
- | os-auth-url = http://localhost:5000/v2.0 |
+ os_auth_url = http://localhost:5000/v2.0 |
(StrOpt) Auth URL to use for OpenStack service access. |
- | os-cacert = None |
+ os_cacert = None |
(StrOpt) Certificate chain for SSL validation. |
- | os-endpoint-type = publicURL |
+ os_endpoint_type = publicURL |
(StrOpt) Type of endpoint in Identity service catalog to use for communication with OpenStack services. |
- | os-password = admin |
+ os_password = admin |
(StrOpt) Password to use for OpenStack service access. |
- | os-region-name = None |
+ os_region_name = None |
(StrOpt) Region name to use for OpenStack service endpoints. |
- | os-tenant-id = |
+ os_tenant_id = |
(StrOpt) Tenant ID to use for OpenStack service access. |
- | os-tenant-name = admin |
+ os_tenant_name = admin |
(StrOpt) Tenant name to use for OpenStack service access. |
- | os-username = ceilometer |
+ os_username = ceilometer |
(StrOpt) User name to use for OpenStack service access. |
diff --git a/doc/common/tables/ceilometer-logging.xml b/doc/common/tables/ceilometer-logging.xml
index b866ac1334..982d05185c 100644
--- a/doc/common/tables/ceilometer-logging.xml
+++ b/doc/common/tables/ceilometer-logging.xml
@@ -39,23 +39,23 @@
(StrOpt) If an instance UUID is passed with the log message, format it like this |
- | log-config-append = None |
+ log_config_append = None |
(StrOpt) The name of logging configuration file. It does not disable existing loggers, but just appends specified logging configuration to any other existing logging options. Please see the Python logging module documentation for details on logging configuration files. |
- | log-date-format = %Y-%m-%d %H:%M:%S |
+ log_date_format = %Y-%m-%d %H:%M:%S |
(StrOpt) Format string for %%(asctime)s in log records. Default: %(default)s |
- | log-dir = None |
+ log_dir = None |
(StrOpt) (Optional) The base directory used for relative --log-file paths |
- | log-file = None |
+ log_file = None |
(StrOpt) (Optional) Name of log file to output to. If no default is set, logging will go to stdout. |
- | log-format = None |
+ log_format = None |
(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. |
@@ -79,7 +79,7 @@
| (BoolOpt) Publish error events |
- | syslog-log-facility = LOG_USER |
+ syslog_log_facility = LOG_USER |
(StrOpt) Syslog facility to receive log lines |
@@ -87,11 +87,11 @@
| (BoolOpt) Log output to standard error |
- | use-syslog = False |
+ use_syslog = False |
(BoolOpt) Use syslog for logging. Existing syslog format is DEPRECATED during I, and then will be changed in J to honor RFC5424 |
- | use-syslog-rfc-format = False |
+ use_syslog_rfc_format = False |
(BoolOpt) (Optional) Use syslog rfc5424 format for logging. If enabled, will add APP-NAME (RFC5424) before the MSG part of the syslog message. The old format without APP-NAME is deprecated in I, and will be removed in J. |
diff --git a/doc/common/tables/cinder-common.xml b/doc/common/tables/cinder-common.xml
index c575d45c21..04f26788b5 100644
--- a/doc/common/tables/cinder-common.xml
+++ b/doc/common/tables/cinder-common.xml
@@ -71,23 +71,23 @@
| (StrOpt) Directory to use for lock files. Default to a temp directory |
- | log-config-append = None |
+ log_config_append = None |
(StrOpt) The name of logging configuration file. It does not disable existing loggers, but just appends specified logging configuration to any other existing logging options. Please see the Python logging module documentation for details on logging configuration files. |
- | log-date-format = %Y-%m-%d %H:%M:%S |
+ log_date_format = %Y-%m-%d %H:%M:%S |
(StrOpt) Format string for %%(asctime)s in log records. Default: %(default)s |
- | log-dir = None |
+ log_dir = None |
(StrOpt) (Optional) The base directory used for relative --log-file paths |
- | log-file = None |
+ log_file = None |
(StrOpt) (Optional) Name of log file to output to. If no default is set, logging will go to stdout. |
- | log-format = None |
+ log_format = None |
(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. |
@@ -191,7 +191,7 @@
| (StrOpt) availability zone of this node |
- | syslog-log-facility = LOG_USER |
+ syslog_log_facility = LOG_USER |
(StrOpt) Syslog facility to receive log lines |
@@ -211,11 +211,11 @@
| (BoolOpt) Log output to standard error |
- | use-syslog = False |
+ use_syslog = False |
(BoolOpt) Use syslog for logging. Existing syslog format is DEPRECATED during I, and then will be changed in J to honor RFC5424 |
- | use-syslog-rfc-format = False |
+ use_syslog_rfc_format = False |
(BoolOpt) (Optional) Use syslog rfc5424 format for logging. If enabled, will add APP-NAME (RFC5424) before the MSG part of the syslog message. The old format without APP-NAME is deprecated in I, and will be removed in J. |
diff --git a/doc/common/tables/glance-logging.xml b/doc/common/tables/glance-logging.xml
index 6717933d09..6b9f64b990 100644
--- a/doc/common/tables/glance-logging.xml
+++ b/doc/common/tables/glance-logging.xml
@@ -39,23 +39,23 @@
| (StrOpt) If an instance UUID is passed with the log message, format it like this |
- | log-config-append = None |
+ log_config_append = None |
(StrOpt) The name of logging configuration file. It does not disable existing loggers, but just appends specified logging configuration to any other existing logging options. Please see the Python logging module documentation for details on logging configuration files. |
- | log-date-format = %Y-%m-%d %H:%M:%S |
+ log_date_format = %Y-%m-%d %H:%M:%S |
(StrOpt) Format string for %%(asctime)s in log records. Default: %(default)s |
- | log-dir = None |
+ log_dir = None |
(StrOpt) (Optional) The base directory used for relative --log-file paths |
- | log-file = None |
+ log_file = None |
(StrOpt) (Optional) Name of log file to output to. If no default is set, logging will go to stdout. |
- | log-format = None |
+ log_format = None |
(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. |
@@ -79,7 +79,7 @@
| (BoolOpt) Publish error events |
- | syslog-log-facility = LOG_USER |
+ syslog_log_facility = LOG_USER |
(StrOpt) Syslog facility to receive log lines |
@@ -87,11 +87,11 @@
| (BoolOpt) Log output to standard error |
- | use-syslog = False |
+ use_syslog = False |
(BoolOpt) Use syslog for logging. Existing syslog format is DEPRECATED during I, and then will be changed in J to honor RFC5424 |
- | use-syslog-rfc-format = False |
+ use_syslog_rfc_format = False |
(BoolOpt) (Optional) Use syslog rfc5424 format for logging. If enabled, will add APP-NAME (RFC5424) before the MSG part of the syslog message. The old format without APP-NAME is deprecated in I, and will be removed in J. |
diff --git a/doc/common/tables/glance-sheepdog.xml b/doc/common/tables/glance-sheepdog.xml
index ab96720c5b..c852c65c8f 100644
--- a/doc/common/tables/glance-sheepdog.xml
+++ b/doc/common/tables/glance-sheepdog.xml
@@ -19,7 +19,7 @@
| [DEFAULT] |
- | sheepdog_store_address = localhost |
+ sheepdog_store_address = 127.0.0.1 |
(StrOpt) IP address of sheep daemon. |
diff --git a/doc/common/tables/heat-api.xml b/doc/common/tables/heat-api.xml
index 2880097c21..64a5c38202 100644
--- a/doc/common/tables/heat-api.xml
+++ b/doc/common/tables/heat-api.xml
@@ -50,6 +50,10 @@
| secure_proxy_ssl_header = X-Forwarded-Proto |
(StrOpt) The HTTP Header that will be used to determine which the original request protocol scheme was, even if it was removed by an SSL terminator proxy. |
+
+ | stack_action_timeout = 3600 |
+ (IntOpt) Timeout in seconds for stack action (ie. create or update). |
+
| stack_domain_admin = None |
(StrOpt) Keystone username, a user with roles sufficient to manage users and projects in the stack_user_domain. |
diff --git a/doc/common/tables/heat-logging.xml b/doc/common/tables/heat-logging.xml
index 5f3e25e16a..3d0d377644 100644
--- a/doc/common/tables/heat-logging.xml
+++ b/doc/common/tables/heat-logging.xml
@@ -31,23 +31,23 @@
(StrOpt) If an instance UUID is passed with the log message, format it like this |
- | log-config-append = None |
+ log_config_append = None |
(StrOpt) The name of logging configuration file. It does not disable existing loggers, but just appends specified logging configuration to any other existing logging options. Please see the Python logging module documentation for details on logging configuration files. |
- | log-date-format = %Y-%m-%d %H:%M:%S |
+ log_date_format = %Y-%m-%d %H:%M:%S |
(StrOpt) Format string for %%(asctime)s in log records. Default: %(default)s |
- | log-dir = None |
+ log_dir = None |
(StrOpt) (Optional) The base directory used for relative --log-file paths |
- | log-file = None |
+ log_file = None |
(StrOpt) (Optional) Name of log file to output to. If no default is set, logging will go to stdout. |
- | log-format = None |
+ log_format = None |
(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. |
@@ -67,7 +67,7 @@
| (StrOpt) prefix each line of exception output with this format |
- | syslog-log-facility = LOG_USER |
+ syslog_log_facility = LOG_USER |
(StrOpt) syslog facility to receive log lines |
@@ -75,7 +75,7 @@
| (BoolOpt) Log output to standard error |
- | use-syslog = False |
+ use_syslog = False |
(BoolOpt) Use syslog for logging. |
diff --git a/doc/common/tables/neutron-common.xml b/doc/common/tables/neutron-common.xml
index 6306e8a422..947a7abd34 100644
--- a/doc/common/tables/neutron-common.xml
+++ b/doc/common/tables/neutron-common.xml
@@ -75,7 +75,7 @@
| (IntOpt) The port to bind to |
- | ca-certs = None |
+ ca_certs = None |
(StrOpt) CA certificates |
@@ -83,11 +83,11 @@
| (StrOpt) The core plugin Neutron will use |
- | ctl-cert = None |
+ ctl_cert = None |
(StrOpt) controller certificate |
- | ctl-privkey = None |
+ ctl_privkey = None |
(StrOpt) controller private key |
diff --git a/doc/common/tables/neutron-logging.xml b/doc/common/tables/neutron-logging.xml
index 19406fc48f..a8920d9362 100644
--- a/doc/common/tables/neutron-logging.xml
+++ b/doc/common/tables/neutron-logging.xml
@@ -39,23 +39,23 @@
| (StrOpt) If an instance UUID is passed with the log message, format it like this |
- | log-config-append = None |
+ log_config_append = None |
(StrOpt) The name of logging configuration file. It does not disable existing loggers, but just appends specified logging configuration to any other existing logging options. Please see the Python logging module documentation for details on logging configuration files. |
- | log-date-format = %Y-%m-%d %H:%M:%S |
+ log_date_format = %Y-%m-%d %H:%M:%S |
(StrOpt) Format string for %%(asctime)s in log records. Default: %(default)s |
- | log-dir = None |
+ log_dir = None |
(StrOpt) (Optional) The base directory used for relative --log-file paths |
- | log-file = None |
+ log_file = None |
(StrOpt) (Optional) Name of log file to output to. If no default is set, logging will go to stdout. |
- | log-format = None |
+ log_format = None |
(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. |
@@ -79,7 +79,7 @@
| (BoolOpt) publish error events |
- | syslog-log-facility = LOG_USER |
+ syslog_log_facility = LOG_USER |
(StrOpt) syslog facility to receive log lines |
@@ -91,7 +91,7 @@
| (BoolOpt) Log output to standard error |
- | use-syslog = False |
+ use_syslog = False |
(BoolOpt) Use syslog for logging. |
diff --git a/doc/common/tables/neutron-ofa_agent.xml b/doc/common/tables/neutron-ofa_agent.xml
index 2406ca14a3..e60593a3cd 100644
--- a/doc/common/tables/neutron-ofa_agent.xml
+++ b/doc/common/tables/neutron-ofa_agent.xml
@@ -19,15 +19,15 @@
| [DEFAULT] |
- | ofp-listen-host = |
+ ofp_listen_host = |
(StrOpt) openflow listen host |
- | ofp-ssl-listen-port = 6633 |
+ ofp_ssl_listen_port = 6633 |
(IntOpt) openflow ssl listen port |
- | ofp-tcp-listen-port = 6633 |
+ ofp_tcp_listen_port = 6633 |
(IntOpt) openflow tcp listen port |
diff --git a/doc/common/tables/nova-libvirt.xml b/doc/common/tables/nova-libvirt.xml
index 530b511570..6370d3cca1 100644
--- a/doc/common/tables/nova-libvirt.xml
+++ b/doc/common/tables/nova-libvirt.xml
@@ -75,7 +75,7 @@
| vif_driver = nova.virt.libvirt.vif.LibvirtGenericVIFDriver |
- (StrOpt) The libvirt VIF driver to configure the VIFs. |
+ (StrOpt) DEPRECATED. The libvirt VIF driver to configure the VIFs.This option is deprecated and will be removed in the Juno release. |
| virt_type = kvm |
diff --git a/doc/common/tables/nova-logging.xml b/doc/common/tables/nova-logging.xml
index fab55834d9..939101aba3 100644
--- a/doc/common/tables/nova-logging.xml
+++ b/doc/common/tables/nova-logging.xml
@@ -43,23 +43,23 @@
(StrOpt) If an instance UUID is passed with the log message, format it like this |
- | log-config-append = None |
+ log_config_append = None |
(StrOpt) The name of logging configuration file. It does not disable existing loggers, but just appends specified logging configuration to any other existing logging options. Please see the Python logging module documentation for details on logging configuration files. |
- | log-date-format = %Y-%m-%d %H:%M:%S |
+ log_date_format = %Y-%m-%d %H:%M:%S |
(StrOpt) Format string for %%(asctime)s in log records. Default: %(default)s |
- | log-dir = None |
+ log_dir = None |
(StrOpt) (Optional) The base directory used for relative --log-file paths |
- | log-file = None |
+ log_file = None |
(StrOpt) (Optional) Name of log file to output to. If no default is set, logging will go to stdout. |
- | log-format = None |
+ log_format = None |
(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. |
@@ -83,7 +83,7 @@
| (BoolOpt) publish error events |
- | syslog-log-facility = LOG_USER |
+ syslog_log_facility = LOG_USER |
(StrOpt) syslog facility to receive log lines |
@@ -91,11 +91,11 @@
| (BoolOpt) Log output to standard error |
- | use-syslog = False |
+ use_syslog = False |
(BoolOpt) Use syslog for logging. Existing syslog format is DEPRECATED during I, and then will be changed in J to honor RFC5424 |
- | use-syslog-rfc-format = False |
+ use_syslog_rfc_format = False |
(BoolOpt) (Optional) Use syslog rfc5424 format for logging. If enabled, will add APP-NAME (RFC5424) before the MSG part of the syslog message. The old format without APP-NAME is deprecated in I, and will be removed in J. |
diff --git a/doc/common/tables/nova-scheduling.xml b/doc/common/tables/nova-scheduling.xml
index 25f8c27034..a1cb4c126e 100644
--- a/doc/common/tables/nova-scheduling.xml
+++ b/doc/common/tables/nova-scheduling.xml
@@ -75,7 +75,7 @@
| (MultiStrOpt) Filter classes available to the scheduler which may be specified more than once. An entry of "nova.scheduler.filters.standard_filters" maps to all filters included with nova. |
- | scheduler_default_filters = RetryFilter, AvailabilityZoneFilter, RamFilter, ComputeFilter, ComputeCapabilitiesFilter, ImagePropertiesFilter |
+ scheduler_default_filters = RetryFilter, AvailabilityZoneFilter, RamFilter, ComputeFilter, ComputeCapabilitiesFilter, ImagePropertiesFilter, ServerGroupAntiAffinityFilter, ServerGroupAffinityFilter |
(ListOpt) Which filter class names to use for filtering hosts when not specified in the request. |
diff --git a/doc/common/tables/trove-logging.xml b/doc/common/tables/trove-logging.xml
index eb44798c6a..dccf339f3c 100644
--- a/doc/common/tables/trove-logging.xml
+++ b/doc/common/tables/trove-logging.xml
@@ -31,23 +31,23 @@
| (StrOpt) If an instance UUID is passed with the log message, format it like this |
- | log-config-append = None |
+ log_config_append = None |
(StrOpt) The name of logging configuration file. It does not disable existing loggers, but just appends specified logging configuration to any other existing logging options. Please see the Python logging module documentation for details on logging configuration files. |
- | log-date-format = %Y-%m-%d %H:%M:%S |
+ log_date_format = %Y-%m-%d %H:%M:%S |
(StrOpt) Format string for %%(asctime)s in log records. Default: %(default)s |
- | log-dir = None |
+ log_dir = None |
(StrOpt) (Optional) The base directory used for relative --log-file paths |
- | log-file = None |
+ log_file = None |
(StrOpt) (Optional) Name of log file to output to. If no default is set, logging will go to stdout. |
- | log-format = None |
+ log_format = None |
(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. |
@@ -75,7 +75,7 @@
| (BoolOpt) publish error events |
- | syslog-log-facility = LOG_USER |
+ syslog_log_facility = LOG_USER |
(StrOpt) syslog facility to receive log lines |
@@ -83,7 +83,7 @@
| (BoolOpt) Log output to standard error |
- | use-syslog = False |
+ use_syslog = False |
(BoolOpt) Use syslog for logging. |
diff --git a/tools/autogenerate-config-flagmappings/heat.flagmappings b/tools/autogenerate-config-flagmappings/heat.flagmappings
index fe41d8679c..eca47e309f 100644
--- a/tools/autogenerate-config-flagmappings/heat.flagmappings
+++ b/tools/autogenerate-config-flagmappings/heat.flagmappings
@@ -98,6 +98,7 @@ rpc_zmq_topic_backlog zeromq
secure_proxy_ssl_header api
sqlite_db database
sqlite_synchronous database
+stack_action_timeout api
stack_domain_admin api
stack_domain_admin_password api
stack_user_domain api