From c96a5ab9466c9e105108a24a83097dc0ddea7466 Mon Sep 17 00:00:00 2001 From: Gauvain Pocentek Date: Sat, 9 May 2015 17:18:15 +0200 Subject: [PATCH] config-ref: update the new/deprecated options tables This patch includes options discovered by the recent autohelp.py updates, and additional deprecated options discovered with https://review.openstack.org/#/c/181650/ Change-Id: I6a525c70ebd3ee7a0f91dc831d39a93f1bce16fd Closes-Bug: #1433367 --- doc/common/tables/ceilometer-conf-changes.xml | 24 +++ doc/common/tables/cinder-conf-changes.xml | 32 +++ doc/common/tables/glance-conf-changes.xml | 24 +++ doc/common/tables/heat-conf-changes.xml | 27 +++ doc/common/tables/keystone-conf-changes.xml | 16 ++ doc/common/tables/neutron-conf-changes.xml | 195 +++++++++++++----- doc/common/tables/nova-conf-changes.xml | 68 ++++++ doc/common/tables/sahara-conf-changes.xml | 20 ++ doc/common/tables/trove-conf-changes.xml | 8 + 9 files changed, 368 insertions(+), 46 deletions(-) diff --git a/doc/common/tables/ceilometer-conf-changes.xml b/doc/common/tables/ceilometer-conf-changes.xml index 49bbfcb8b9..3a9f176d4c 100644 --- a/doc/common/tables/ceilometer-conf-changes.xml +++ b/doc/common/tables/ceilometer-conf-changes.xml @@ -316,6 +316,10 @@ [oslo_messaging_rabbit] rpc_conn_pool_size = 30 (IntOpt) Size of RPC connection pool. + + [oslo_middleware] max_request_body_size = 114688 + (IntOpt) The maximum body size for each request, in bytes. + [oslo_policy] policy_default_rule = default (StrOpt) Default rule. Enforced when a requested rule is not found. @@ -389,13 +393,33 @@ New Option + + [alarm] evaluation_service + None + + + [DEFAULT] log_format + None + [database] time_to_live [database] metering_time_to_live + + [DEFAULT] database_connection + None + [publisher] metering_secret [publisher] telemetry_secret + + [alarm] partition_rpc_topic + None + + + [DEFAULT] use_syslog + None + diff --git a/doc/common/tables/cinder-conf-changes.xml b/doc/common/tables/cinder-conf-changes.xml index 0736c60148..fdfa67063d 100644 --- a/doc/common/tables/cinder-conf-changes.xml +++ b/doc/common/tables/cinder-conf-changes.xml @@ -584,6 +584,10 @@ [oslo_messaging_rabbit] rpc_conn_pool_size = 30 (IntOpt) Size of RPC connection pool. + + [oslo_middleware] max_request_body_size = 114688 + (IntOpt) The maximum body size for each request, in bytes. + @@ -658,14 +662,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -678,5 +706,9 @@ + + + +
New default values
New Option
[DEFAULT] log-formatNone
[DEFAULT] use-syslogNone
[DEFAULT] use_syslogNone
[DEFAULT] osapi_max_request_body_size[oslo_middleware] max_request_body_size
[DEFAULT] eqlx_chap_password [DEFAULT] chap_password
[DEFAULT] datera_api_tokenNone
[DEFAULT] eqlx_use_chap [DEFAULT] use_chap_auth
[DEFAULT] enable_v1_apiNone
[DEFAULT] db_backend [database] backend[DEFAULT] eqlx_chap_login [DEFAULT] chap_username
[DEFAULT] log_formatNone
diff --git a/doc/common/tables/glance-conf-changes.xml b/doc/common/tables/glance-conf-changes.xml index b75b2138e8..0402545599 100644 --- a/doc/common/tables/glance-conf-changes.xml +++ b/doc/common/tables/glance-conf-changes.xml @@ -523,9 +523,33 @@ New Option + + [DEFAULT] log-format + None + + + [glance_store] vmware_datacenter_path + None + + + [DEFAULT] log_format + None + + + [DEFAULT] use-syslog + None + [task] eventlet_executor_pool_size [taskflow_executor] max_workers + + [glance_store] vmware_datastore_name + None + + + [DEFAULT] use_syslog + None + diff --git a/doc/common/tables/heat-conf-changes.xml b/doc/common/tables/heat-conf-changes.xml index 0e31f16b87..1c7b98386a 100644 --- a/doc/common/tables/heat-conf-changes.xml +++ b/doc/common/tables/heat-conf-changes.xml @@ -300,6 +300,10 @@ [oslo_messaging_rabbit] rpc_conn_pool_size = 30 (IntOpt) Size of RPC connection pool. + + [oslo_middleware] max_request_body_size = 114688 + (IntOpt) The maximum body size for each request, in bytes. + [profiler] profiler_enabled = False (BoolOpt) If False fully disable profiling feature. @@ -362,4 +366,27 @@ + + + + + + + + + + + + + + + + + + + + + + +
Deprecated options
Deprecated optionNew Option
[DEFAULT] log-formatNone
[DEFAULT] use-syslogNone
[DEFAULT] list_notifier_driversNone
diff --git a/doc/common/tables/keystone-conf-changes.xml b/doc/common/tables/keystone-conf-changes.xml index 0593088a13..cf36c25497 100644 --- a/doc/common/tables/keystone-conf-changes.xml +++ b/doc/common/tables/keystone-conf-changes.xml @@ -352,6 +352,10 @@ [oslo_messaging_rabbit] rpc_conn_pool_size = 30 (IntOpt) Size of RPC connection pool. + + [oslo_middleware] max_request_body_size = 114688 + (IntOpt) The maximum body size for each request, in bytes. + [oslo_policy] policy_default_rule = default (StrOpt) Default rule. Enforced when a requested rule is not found. @@ -469,6 +473,14 @@ [DEFAULT] admin_bind_host [eventlet_server] admin_bind_host + + [DEFAULT] log-format + None + + + [DEFAULT] use-syslog + None + [DEFAULT] admin_workers [eventlet_server] admin_workers @@ -485,6 +497,10 @@ [assignment] caching [resource] caching + + [DEFAULT] max_request_body_size + [oslo_middleware] max_request_body_size + [assignment] cache_time [resource] cache_time diff --git a/doc/common/tables/neutron-conf-changes.xml b/doc/common/tables/neutron-conf-changes.xml index 8ebeef1fd4..1f947d80da 100644 --- a/doc/common/tables/neutron-conf-changes.xml +++ b/doc/common/tables/neutron-conf-changes.xml @@ -21,8 +21,8 @@ (BoolOpt) Automatically remove networks from offline DHCP agents. - [DEFAULT] default_device_name = Switch1 - (StrOpt) default_device_name of the l2 gateway + [DEFAULT] conn_idle_timeout = 900 + (IntOpt) Reconnect connection to nsx if not used within this amount of time. [DEFAULT] default_ipv4_subnet_pool = None @@ -52,10 +52,6 @@ [DEFAULT] ipv6_gateway = (StrOpt) With IPv6, the network used for the external gateway does not need to have an associated subnet, since the automatically assigned link-local address (LLA) can be used. However, an IPv6 gateway address is needed for use as the next-hop for the default route. If no IPv6 gateway address is configured here, (and only then) the neutron router will be configured to get its default route from router advertisements (RAs) from the upstream router; in which case the upstream router must also be configured to send these RAs. The ipv6_gateway, when configured, should be the LLA of the interface on the upstream router. If a next-hop using a global unique address (GUA) is desired, it needs to be done via a subnet allocated to the network and not through this parameter. - - [DEFAULT] l2gw_callback_class = networking_l2gw.services.l2gateway.ovsdb.data.L2GatewayOVSDBCallbacks - (StrOpt) L2 gateway plugin callback class where theRPCs from the agent are going to get invoked - [DEFAULT] log-config-append = None (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. @@ -100,10 +96,6 @@ [DEFAULT] nova_admin_tenant_name = None (StrOpt) The name of the admin nova tenant. Deprecated in favour of an auth plugin in [nova]. - - [DEFAULT] periodic_monitoring_interval = 5 - (IntOpt) Periodic interval at which the plugin checks for the monitoring L2 gateway agent - [DEFAULT] policy_default_rule = default (StrOpt) Default rule. Enforced when a requested rule is not found. @@ -112,10 +104,6 @@ [DEFAULT] policy_dirs = ['policy.d'] (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. - - [DEFAULT] quota_l2_gateway = 5 - (IntOpt) Number of l2 gateways allowed per tenant, -1 for unlimited - [DEFAULT] syslog-log-facility = LOG_USER (StrOpt) Syslog facility to receive log lines. @@ -156,6 +144,10 @@ [AGENT] use_helper_for_ns_read = True (BoolOpt) Use the root helper to read the namespaces from the operating system. + + [MIDONET] client = midonet.neutron.client.api.MidonetApiClient + (StrOpt) MidoNet client used to access MidoNet data storage. + [MIDONET] cluster_ip = localhost (StrOpt) IP that the cluster service can be reached on @@ -168,10 +160,6 @@ [MIDONET] tunnel_protocol = vxlan (StrOpt) Tunnel protocol used by Midonet - - [MIDONET] use_cluster = False - (BoolOpt) Use the midonet plugin that interacts with the tasks-based architecture, rather than the plugin that interacts with the HTTP based architecture. - [OFC] support_packet_filter_on_ofc_router = True (BoolOpt) Support packet filter on OFC router interface. @@ -188,10 +176,18 @@ [OVSVAPP] bridge_mappings = (ListOpt) Bridge mappings. + + [OVSVAPP] dont_fragment = True + (IntOpt) Do not fragment. + [OVSVAPP] integration_bridge = br-int (StrOpt) Integration Bridge. + + [OVSVAPP] local_ip = + (StrOpt) Local IP address of VXLAN tunnel endpoint. + [OVSVAPP] network_manager = networking_vsphere.drivers.manager.VcenterManager (StrOpt) Driver Manager implementation for NetworkDriver. @@ -206,12 +202,24 @@ [OVSVAPP] tenant_network_type = vlan - (StrOpt) Network type for tenant networks - vlan. + (StrOpt) Network type for tenant networks + + + [OVSVAPP] tunnel_bridge = br-tun + (StrOpt) Tunnel Bridge for tunneling. + + + [OVSVAPP] tunnel_types = vxlan + (ListOpt) Tunnel network types supported by the OVSvApp Agent. [OVSVAPP] veth_mtu = 1500 (IntOpt) MTU size of veth interfaces. + + [OVSVAPP] vxlan_udp_port = 4789 + (IntOpt) The UDP port to use for VXLAN tunnels. + [SECURITYGROUP] defer_apply = True (BoolOpt) Enable defer_apply on security bridge. @@ -472,6 +480,106 @@ [nova] timeout = None (IntOpt) Timeout value for http requests + + [nsx_v3] default_edge_cluster_uuid = None + (StrOpt) Default edge cluster identifier + + + [nsxv] backup_edge_pool = service:large:4:10, service:compact:4:10, vdr:large:4:10 + (ListOpt) Defines edge pool using the format: <edge_type>:[edge_size]:<min_edges>:<max_edges>.edge_type: service,vdr. edge_size: compact, large, xlarge, quadlarge and default is large. + + + [nsxv] cluster_moid = + (ListOpt) Parameter listing the IDs of the clusters which are used by OpenStack. + + + [nsxv] datacenter_moid = None + (StrOpt) Optional parameter identifying the ID of datacenter to deploy NSX Edges + + + [nsxv] datastore_id = None + (StrOpt) Optional parameter identifying the ID of datastore to deploy NSX Edges + + + [nsxv] deployment_container_id = None + (StrOpt) Optional parameter identifying the ID of datastore to deploy NSX Edges + + + [nsxv] dvs_id = None + (StrOpt) DVS ID for VLANs + + + [nsxv] external_network = None + (StrOpt) Network ID for physical network connectivity + + + [nsxv] manager_uri = None + (StrOpt) uri for vsm + + + [nsxv] maximum_tunnels_per_vnic = 20 + (IntOpt) Maximum number of sub interfaces supported per vnic in edge. The value should be in 1-110. + + + [nsxv] metadata_shared_secret = None + (StrOpt) Shared secret to sign metadata requests + + + [nsxv] mgt_net_default_gateway = None + (StrOpt) Management network default gateway for metadata proxy + + + [nsxv] mgt_net_moid = None + (StrOpt) Network ID for management network connectivity + + + [nsxv] mgt_net_proxy_ips = None + (ListOpt) Management network IP address for metadata proxy + + + [nsxv] mgt_net_proxy_netmask = None + (StrOpt) Management network netmask for metadata proxy + + + [nsxv] nova_metadata_ips = None + (ListOpt) IP addresses used by Nova metadata service + + + [nsxv] nova_metadata_port = 8775 + (IntOpt) TCP Port used by Nova metadata server + + + [nsxv] password = default + (StrOpt) Password for vsm + + + [nsxv] resource_pool_id = None + (StrOpt) Optional parameter identifying the ID of resource to deploy NSX Edges + + + [nsxv] retries = 10 + (IntOpt) Maximum number of API retries on endpoint. + + + [nsxv] spoofguard_enabled = True + (BoolOpt) If True then plugin will use NSXV spoofguard component for port-security feature. + + + [nsxv] task_status_check_interval = 2000 + (IntOpt) Task status check interval + + + [nsxv] tenant_router_types = shared, distributed, exclusive + (ListOpt) Ordered list of router_types to allocate as tenant routers. + + + [nsxv] user = admin + (StrOpt) User name for vsm + + + [nsxv] vdn_scope_id = None + (StrOpt) Network scope ID for VXLAN virtual wires + [oslo_concurrency] disable_process_locking = False (BoolOpt) Enables or disables inter-process locks. @@ -673,28 +781,8 @@ (IntOpt) Size of RPC connection pool. - [ovsdb] l2_gw_agent_ca_cert_base_path = None - (StrOpt) Trusted issuer CA cert - - - [ovsdb] l2_gw_agent_cert_base_path = None - (StrOpt) L2 gateway agent public certificate - - - [ovsdb] l2_gw_agent_priv_key_base_path = None - (StrOpt) L2 gateway agent private key - - - [ovsdb] max_connection_retries = 10 - (IntOpt) Maximum number of retries to open a socket with the OVSDB server - - - [ovsdb] ovsdb_hosts = host1:127.0.0.1:6632 - (StrOpt) OVSDB server name:host/IP:port - - - [ovsdb] periodic_interval = 20 - (IntOpt) Seconds between periodic task runs + [oslo_middleware] max_request_body_size = 114688 + (IntOpt) The maximum body size for each request, in bytes. @@ -709,11 +797,6 @@ - - - - - @@ -795,10 +878,26 @@ + + + + + + + + + + + + + + + + @@ -807,5 +906,9 @@ + + + +
New default value
[DEFAULT] default_interface_namebreth0FortyGigE1/0/1
[DEFAULT] default_log_levels amqp=WARN, amqplib=WARN, boto=WARN, qpid=WARN, sqlalchemy=WARN, suds=INFO, oslo.messaging=INFO, iso8601=WARN, requests.packages.urllib3.connectionpool=WARNNew Option
[DEFAULT] use-syslogNone
[DEFAULT] use_syslogNone
[DEFAULT] max_request_body_size[oslo_middleware] max_request_body_size
[DEFAULT] nova_api_insecure [nova] insecure
[DEFAULT] log-formatNone
[DEFAULT] nova_ca_certificates_file [nova] cafile[DEFAULT] nova_region_name [nova] region_name
[DEFAULT] log_formatNone
diff --git a/doc/common/tables/nova-conf-changes.xml b/doc/common/tables/nova-conf-changes.xml index 1eaf16f073..9a30225ecf 100644 --- a/doc/common/tables/nova-conf-changes.xml +++ b/doc/common/tables/nova-conf-changes.xml @@ -528,6 +528,10 @@ [oslo_messaging_rabbit] rpc_conn_pool_size = 30 (IntOpt) Size of RPC connection pool. + + [oslo_middleware] max_request_body_size = 114688 + (IntOpt) The maximum body size for each request, in bytes. + [serial_console] serialproxy_host = 0.0.0.0 (StrOpt) Host on which to listen for incoming requests @@ -618,18 +622,74 @@ New Option + + [DEFAULT] network_device_mtu + None + + + [DEFAULT] log-format + None + + + [DEFAULT] use-syslog + None + [cinder] http_timeout [cinder] timeout + + [DEFAULT] use_syslog + None + + + [ironic] client_log_level + None + + + [neutron] admin_username + None + + + [DEFAULT] osapi_max_request_body_size + [oslo_middleware] max_request_body_size + [neutron] ca_certificates_file [neutron] cafile + + [neutron] auth_strategy + None + + + [neutron] admin_user_id + None + + + [neutron] admin_tenant_id + None + + + [DEFAULT] log_format + None + [cinder] api_insecure [cinder] insecure + + [neutron] admin_tenant_name + None + + + [neutron] admin_password + None + + + [DEFAULT] share_dhcp_address + None + [neutron] api_insecure [neutron] insecure @@ -638,9 +698,17 @@ [cinder] ca_certificates_file [cinder] cafile + + [neutron] admin_auth_url + None + [neutron] url_timeout [neutron] timeout + + [neutron] allow_duplicate_networks + None + diff --git a/doc/common/tables/sahara-conf-changes.xml b/doc/common/tables/sahara-conf-changes.xml index e4002526c8..7d0362c9c9 100644 --- a/doc/common/tables/sahara-conf-changes.xml +++ b/doc/common/tables/sahara-conf-changes.xml @@ -324,6 +324,10 @@ [oslo_messaging_rabbit] rpc_conn_pool_size = 30 (IntOpt) Size of RPC connection pool. + + [oslo_middleware] max_request_body_size = 114688 + (IntOpt) The maximum body size for each request, in bytes. + [oslo_policy] policy_default_rule = default (StrOpt) Default rule. Enforced when a requested rule is not found. @@ -423,9 +427,25 @@ New Option + + [DEFAULT] log-format + None + + + [DEFAULT] use-syslog + None + [DEFAULT] detach_volume_timeout [timeouts] detach_volume_timeout + + [DEFAULT] log_format + None + + + [DEFAULT] use_syslog + None + diff --git a/doc/common/tables/trove-conf-changes.xml b/doc/common/tables/trove-conf-changes.xml index 53db60a913..3261aac57d 100644 --- a/doc/common/tables/trove-conf-changes.xml +++ b/doc/common/tables/trove-conf-changes.xml @@ -542,6 +542,10 @@ New Option + + [DEFAULT] use_syslog + None + [rpc_notifier2] topics [DEFAULT] notification_topics @@ -558,5 +562,9 @@ [DEFAULT] sql_idle_timeout [database] idle_timeout + + [DEFAULT] log_format + None +