Merge "[config-ref] Update octavia tables"

2016-09-05 07:21:09 +00:00 · 2016-09-05 07:21:09 +00:00 · 33bed19d34
commit 33bed19d34
parent 7b8ac224a4 1d363c32dc
6 changed files with 173 additions and 37 deletions
--- a/doc/config-reference/source/tables/octavia-common.rst
+++ b/doc/config-reference/source/tables/octavia-common.rst
@ -24,8 +24,6 @@
     - (Boolean) Allow the usage of the pagination
   * - ``allow_sorting`` = ``False``
     - (Boolean) Allow the usage of the sorting
-   * - ``pagination_max_limit`` = ``-1``
-     - (String) The maximum number of items returned in a single response, value was 'infinite' or negative integer means no limit
   * - ``api_extensions_path`` =
     - (String) The path for API extensions
   * - ``api_handler`` = ``queue_producer``
@ -46,13 +44,15 @@
     - (String) The hostname Octavia is running on
   * - ``octavia_plugins`` = ``hot_plug_plugin``
     - (String) Name of the controller plugin to use
+   * - ``pagination_max_limit`` = ``-1``
+     - (String) The maximum number of items returned in a single response. The string 'infinite' or a negative integer value means 'no limit'
   * - **[amphora_agent]**
     -
   * - ``agent_server_ca`` = ``/etc/octavia/certs/client_ca.pem``
     - (String) The ca which signed the client certificates
   * - ``agent_server_cert`` = ``/etc/octavia/certs/server.pem``
     - (String) The server certificate for the agent.py server to use
-   * - ``agent_server_network_dir`` = ``/etc/network/interfaces.d/``
+   * - ``agent_server_network_dir`` = ``/etc/netns/amphora-haproxy/network/interfaces.d/``
     - (String) The directory where new network interfaces are located
   * - ``agent_server_network_file`` = ``None``
     - (String) The file where the network interfaces are located. Specifying this will override any value set for agent_server_network_dir.
@ -60,11 +60,11 @@
     - (String) The amphora ID.
   * - **[anchor]**
     -
-   * - ``password`` = ``simplepassword``
+   * - ``password`` = ``None``
     - (String) Anchor password
   * - ``url`` = ``http://localhost:9999/v1/sign/default``
     - (String) Anchor URL
-   * - ``username`` = ``myusername``
+   * - ``username`` = ``None``
     - (String) Anchor username
   * - **[certificates]**
     -
@ -94,6 +94,8 @@
     - (Integer) Retry attempts to wait for Amphora to become active
   * - ``amp_active_wait_sec`` = ``10``
     - (Integer) Seconds to wait between checks on whether an Amphora has become active
+   * - ``amp_boot_network_list`` =
+     - (List) List of networks to attach to the Amphorae. All networks defined in the list will be attached to each amphora.
   * - ``amp_flavor_id`` =
     - (String) Nova instance flavor id for the Amphora
   * - ``amp_image_id`` =
@ -101,9 +103,9 @@
   * - ``amp_image_tag`` =
     - (String) Glance image tag for the Amphora image to boot. Use this option to be able to update the image without reconfiguring Octavia. Ignored if amp_image_id is defined.
   * - ``amp_network`` =
-     - (String) Network to attach to the Amphora
+     - (String) DEPRECATED: Network to attach to the Amphorae. Replaced by amp_boot_network_list.
   * - ``amp_secgroup_list`` =
-     - (List) List of security groups to attach to the Amphora
+     - (List) List of security groups to attach to the Amphora.
   * - ``amp_ssh_access_allowed`` = ``True``
     - (Boolean) Determines whether or not to allow access to the Amphorae
   * - ``amp_ssh_key_name`` =
@ -185,7 +187,7 @@
   * - ``health_check_interval`` = ``3``
     - (Integer) Sleep time between health checks in seconds.
   * - ``heartbeat_interval`` = ``10``
-     - (Integer) Sleep time between sending hearthbeats.
+     - (Integer) Sleep time between sending heartbeats.
   * - ``heartbeat_key`` = ``None``
     - (String) key used to validate amphora sendingthe message
   * - ``heartbeat_timeout`` = ``60``
@ -206,6 +208,8 @@
     - (Integer) Number of threads performing amphora certificate rotation
   * - ``cleanup_interval`` = ``30``
     - (Integer) DB cleanup interval in seconds
+   * - ``load_balancer_expiry_age`` = ``604800``
+     - (Integer) Load balancer expiry age in seconds
   * - ``spare_amphora_pool_size`` = ``0``
     - (Integer) Number of spare amphorae
   * - ``spare_check_interval`` = ``30``
@ -217,19 +221,21 @@
   * - ``vrrp_check_interval`` = ``5``
     - (Integer) VRRP health check script run interval in seconds.
   * - ``vrrp_fail_count`` = ``2``
-     - (Integer) Number of successive failure before transition to a fail state.
+     - (Integer) Number of successive failures before transition to a fail state.
   * - ``vrrp_garp_refresh_count`` = ``2``
     - (Integer) Number of gratuitous ARP announcements to make on each refresh interval.
   * - ``vrrp_garp_refresh_interval`` = ``5``
     - (Integer) Time in seconds between gratuitous ARP announcements from the MASTER.
   * - ``vrrp_success_count`` = ``2``
-     - (Integer) Number of successive failure before transition to a success state.
+     - (Integer) Number of consecutive successes before transition to a success state.
   * - **[networking]**
     -
   * - ``lb_network_name`` = ``None``
     - (String) Name of amphora internal network
   * - ``max_retries`` = ``15``
     - (Integer) The maximum attempts to retry an action with the networking service.
+   * - ``port_detach_timeout`` = ``300``
+     - (Integer) Seconds to wait for a port to detach from an amphora.
   * - ``retry_interval`` = ``1``
     - (Integer) Seconds to wait before retrying an action with the networking service.
   * - **[neutron]**
@ -264,10 +270,12 @@
     - (String) The name of the nova service in the keystone catalog
   * - **[oslo_middleware]**
     -
+   * - ``enable_proxy_headers_parsing`` = ``False``
+     - (Boolean) Whether the application is behind a proxy or not. This determines if the middleware should parse the headers or not.
   * - ``max_request_body_size`` = ``114688``
     - (Integer) The maximum body size for each request, in bytes.
   * - ``secure_proxy_ssl_header`` = ``X-Forwarded-Proto``
-     - (String) DEPRECATED: The HTTP Header that will be used to determine what the original request protocol scheme was, even if it was hidden by an SSL termination proxy.
+     - (String) DEPRECATED: The HTTP Header that will be used to determine what the original request protocol scheme was, even if it was hidden by a SSL termination proxy.
   * - **[task_flow]**
     -
   * - ``engine`` = ``serial``
--- a/doc/config-reference/source/tables/octavia-rabbitmq.rst
+++ b/doc/config-reference/source/tables/octavia-rabbitmq.rst
@ -24,8 +24,14 @@
     - (Boolean) Use durable queues in AMQP.
   * - ``channel_max`` = ``None``
     - (Integer) Maximum number of channels to allow
+   * - ``conn_pool_min_size`` = ``2``
+     - (Integer) The pool size limit for connections expiration policy
+   * - ``conn_pool_ttl`` = ``1200``
+     - (Integer) The time-to-live in sec of idle connections in the pool
+   * - ``connection_factory`` = ``single``
+     - (String) Connection factory implementation
   * - ``default_notification_exchange`` = ``${control_exchange}_notification``
-     - (String) Exchange name for for sending notifications
+     - (String) Exchange name for sending notifications
   * - ``default_notification_retry_attempts`` = ``-1``
     - (Integer) Reconnecting retry count in case of connectivity problem during sending notification, -1 means infinite retry.
   * - ``default_rpc_exchange`` = ``${control_exchange}_rpc``
@ -36,7 +42,7 @@
     - (Boolean) Deprecated, use rpc_backend=kombu+memory or rpc_backend=fake
   * - ``frame_max`` = ``None``
     - (Integer) The maximum byte size for an AMQP frame
-   * - ``heartbeat_interval`` = ``1``
+   * - ``heartbeat_interval`` = ``3``
     - (Integer) How often to send heartbeats for consumer's connections
   * - ``heartbeat_rate`` = ``2``
     - (Integer) How often times during the heartbeat_timeout_threshold we check the heartbeat.
@ -68,7 +74,7 @@
     - (Floating point) Reconnecting retry delay in case of connectivity problem during sending notification message
   * - ``pool_max_overflow`` = ``0``
     - (Integer) Maximum number of connections to create above `pool_max_size`.
-   * - ``pool_max_size`` = ``10``
+   * - ``pool_max_size`` = ``30``
     - (Integer) Maximum number of connections to keep queued.
   * - ``pool_recycle`` = ``600``
     - (Integer) Lifetime of a connection (since creation) in seconds or None for no recycling. Expired connections are closed on acquire.
@ -79,19 +85,19 @@
   * - ``rabbit_ha_queues`` = ``False``
     - (Boolean) Try to use HA queues in RabbitMQ (x-ha-policy: all). If you change this option, you must wipe the RabbitMQ database. In RabbitMQ 3.0, queue mirroring is no longer controlled by the x-ha-policy argument when declaring a queue. If you just want to make sure that all queues (except those with auto-generated names) are mirrored across all nodes, run: "rabbitmqctl set_policy HA '^(?!amq\.).*' '{"ha-mode": "all"}' "
   * - ``rabbit_host`` = ``localhost``
-     - (String) The RabbitMQ broker address where a single node is used.
+     - (String) DEPRECATED: The RabbitMQ broker address where a single node is used. Replaced by [DEFAULT]/transport_url
   * - ``rabbit_hosts`` = ``$rabbit_host:$rabbit_port``
-     - (List) RabbitMQ HA cluster host:port pairs.
+     - (List) DEPRECATED: RabbitMQ HA cluster host:port pairs. Replaced by [DEFAULT]/transport_url
   * - ``rabbit_interval_max`` = ``30``
     - (Integer) Maximum interval of RabbitMQ connection retries. Default is 30 seconds.
   * - ``rabbit_login_method`` = ``AMQPLAIN``
     - (String) The RabbitMQ login method.
   * - ``rabbit_max_retries`` = ``0``
-     - (Integer) Maximum number of RabbitMQ connection retries. Default is 0 (infinite retry count).
+     - (Integer) DEPRECATED: Maximum number of RabbitMQ connection retries. Default is 0 (infinite retry count).
   * - ``rabbit_password`` = ``guest``
-     - (String) The RabbitMQ password.
+     - (String) DEPRECATED: The RabbitMQ password. Replaced by [DEFAULT]/transport_url
   * - ``rabbit_port`` = ``5672``
-     - (Port number) The RabbitMQ broker port where a single node is used.
+     - (Port number) DEPRECATED: The RabbitMQ broker port where a single node is used. Replaced by [DEFAULT]/transport_url
   * - ``rabbit_qos_prefetch_count`` = ``0``
     - (Integer) Specifies the number of messages to prefetch. Setting to zero allows unlimited messages.
   * - ``rabbit_retry_backoff`` = ``2``
@ -103,9 +109,9 @@
   * - ``rabbit_use_ssl`` = ``False``
     - (Boolean) Connect over SSL for RabbitMQ.
   * - ``rabbit_userid`` = ``guest``
-     - (String) The RabbitMQ userid.
+     - (String) DEPRECATED: The RabbitMQ userid. Replaced by [DEFAULT]/transport_url
   * - ``rabbit_virtual_host`` = ``/``
-     - (String) The RabbitMQ virtual host.
+     - (String) DEPRECATED: The RabbitMQ virtual host. Replaced by [DEFAULT]/transport_url
   * - ``rpc_conn_pool_size`` = ``30``
     - (Integer) Size of RPC connection pool.
   * - ``rpc_listener_prefetch_count`` = ``100``
--- a/doc/config-reference/source/tables/octavia-redis.rst
+++ b/doc/config-reference/source/tables/octavia-redis.rst
@ -21,16 +21,16 @@
   * - ``check_timeout`` = ``20000``
     - (Integer) Time in ms to wait before the transaction is killed.
   * - ``host`` = ``127.0.0.1``
-     - (String) Host to locate redis.
+     - (String) DEPRECATED: Host to locate redis. Replaced by [DEFAULT]/transport_url
   * - ``password`` =
-     - (String) Password for Redis server (optional).
+     - (String) DEPRECATED: Password for Redis server (optional). Replaced by [DEFAULT]/transport_url
   * - ``port`` = ``6379``
-     - (Port number) Use this port to connect to redis host.
+     - (Port number) DEPRECATED: Use this port to connect to redis host. Replaced by [DEFAULT]/transport_url
   * - ``sentinel_group_name`` = ``oslo-messaging-zeromq``
     - (String) Redis replica set name.
   * - ``sentinel_hosts`` =
-     - (List) List of Redis Sentinel hosts (fault tolerance mode) e.g. [host:port, host1:port ... ]
-   * - ``socket_timeout`` = ``1000``
+     - (List) DEPRECATED: List of Redis Sentinel hosts (fault tolerance mode) e.g. [host:port, host1:port ... ] Replaced by [DEFAULT]/transport_url
+   * - ``socket_timeout`` = ``10000``
     - (Integer) Timeout in ms on blocking socket operations
-   * - ``wait_timeout`` = ``500``
+   * - ``wait_timeout`` = ``2000``
     - (Integer) Time in ms to wait between connection attempts.
--- a/doc/config-reference/source/tables/octavia-rpc.rst
+++ b/doc/config-reference/source/tables/octavia-rpc.rst
@ -19,7 +19,7 @@
   * - **[DEFAULT]**
     -
   * - ``transport_url`` = ``None``
-     - (String) A URL representing the messaging driver to use and its full configuration. If not set, we fall back to the rpc_backend option and driver specific configuration.
+     - (String) A URL representing the messaging driver to use and its full configuration.
   * - **[oslo_concurrency]**
     -
   * - ``disable_process_locking`` = ``False``
@ -34,18 +34,52 @@
     - (String) No help text available for this option.
   * - **[oslo_messaging_amqp]**
     -
+   * - ``addressing_mode`` = ``dynamic``
+     - (String) Indicates the addressing mode used by the driver. Permitted values: 'legacy' - use legacy non-routable addressing 'routable' - use routable addresses 'dynamic' - use legacy addresses if the message bus does not support routing otherwise use routable addressing
   * - ``allow_insecure_clients`` = ``False``
     - (Boolean) Accept clients using either SSL or plain TCP
+   * - ``anycast_address`` = ``anycast``
+     - (String) Appended to the address prefix when sending to a group of consumers. Used by the message bus to identify messages that should be delivered in a round-robin fashion across consumers.
   * - ``broadcast_prefix`` = ``broadcast``
     - (String) address prefix used when broadcasting to all servers
+   * - ``connection_retry_backoff`` = ``2``
+     - (Integer) Increase the connection_retry_interval by this many seconds after each unsuccessful failover attempt.
+   * - ``connection_retry_interval`` = ``1``
+     - (Integer) Seconds to pause before attempting to re-connect.
+   * - ``connection_retry_interval_max`` = ``30``
+     - (Integer) Maximum limit for connection_retry_interval + connection_retry_backoff
   * - ``container_name`` = ``None``
-     - (String) Name for the AMQP container
+     - (String) Name for the AMQP container. must be globally unique. Defaults to a generated UUID
+   * - ``default_notification_exchange`` = ``None``
+     - (String) Exchange name used in notification addresses. Exchange name resolution precedence: Target.exchange if set else default_notification_exchange if set else control_exchange if set else 'notify'
+   * - ``default_notify_timeout`` = ``30``
+     - (Integer) The deadline for a sent notification message delivery. Only used when caller does not provide a timeout expiry.
+   * - ``default_reply_timeout`` = ``30``
+     - (Integer) The deadline for an rpc reply message delivery. Only used when caller does not provide a timeout expiry.
+   * - ``default_rpc_exchange`` = ``None``
+     - (String) Exchange name used in RPC addresses. Exchange name resolution precedence: Target.exchange if set else default_rpc_exchange if set else control_exchange if set else 'rpc'
+   * - ``default_send_timeout`` = ``30``
+     - (Integer) The deadline for an rpc cast or call message delivery. Only used when caller does not provide a timeout expiry.
   * - ``group_request_prefix`` = ``unicast``
     - (String) address prefix when sending to any server in group
   * - ``idle_timeout`` = ``0``
     - (Integer) Timeout for inactive connections (in seconds)
+   * - ``link_retry_delay`` = ``10``
+     - (Integer) Time to pause between re-connecting an AMQP 1.0 link that failed due to a recoverable error.
+   * - ``multicast_address`` = ``multicast``
+     - (String) Appended to the address prefix when sending a fanout message. Used by the message bus to identify fanout messages.
+   * - ``notify_address_prefix`` = ``openstack.org/om/notify``
+     - (String) Address prefix for all generated Notification addresses
+   * - ``notify_server_credit`` = ``100``
+     - (Integer) Window size for incoming Notification messages
   * - ``password`` =
     - (String) Password for message broker authentication
+   * - ``reply_link_credit`` = ``200``
+     - (Integer) Window size for incoming RPC Reply messages.
+   * - ``rpc_address_prefix`` = ``openstack.org/om/rpc``
+     - (String) Address prefix for all generated RPC addresses
+   * - ``rpc_server_credit`` = ``100``
+     - (Integer) Window size for incoming RPC Request messages
   * - ``sasl_config_dir`` =
     - (String) Path to directory that contains the SASL configuration
   * - ``sasl_config_name`` =
@ -64,6 +98,8 @@
     - (String) Password for decrypting ssl_key_file (if encrypted)
   * - ``trace`` = ``False``
     - (Boolean) Debug: dump AMQP frames to stdout
+   * - ``unicast_address`` = ``unicast``
+     - (String) Appended to the address prefix when sending to a particular RPC/Notification server. Used by the message bus to identify messages sent to a single destination.
   * - ``username`` =
     - (String) User name for message broker authentication
   * - **[oslo_messaging_notifications]**
--- a/doc/config-reference/source/tables/octavia-zeromq.rst
+++ b/doc/config-reference/source/tables/octavia-zeromq.rst
@ -19,7 +19,7 @@
   * - **[DEFAULT]**
     -
   * - ``rpc_backend`` = ``rabbit``
-     - (String) The messaging driver to use, defaults to rabbit. Other drivers include amqp and zmq.
+     - (String) DEPRECATED: The messaging driver to use, defaults to rabbit. Other drivers include amqp and zmq. Replaced by [DEFAULT]/transport_url
   * - ``rpc_cast_timeout`` = ``-1``
     - (Integer) Seconds to wait before a cast expires (TTL). The default value of -1 specifies an infinite linger period. The value of 0 specifies no linger period. Pending messages shall be discarded immediately when the socket is closed. Only supported by impl_zmq.
   * - ``rpc_conn_pool_size`` = ``30``
@ -32,8 +32,6 @@
     - (String) ZeroMQ bind address. Should be a wildcard (*), an ethernet interface, or IP. The "host" option should point or resolve to this address.
   * - ``rpc_zmq_bind_port_retries`` = ``100``
     - (Integer) Number of retries to find free port number before fail with ZMQBindError.
-   * - ``rpc_zmq_concurrency`` = ``eventlet``
-     - (String) Type of concurrency used. Either "native" or "eventlet"
   * - ``rpc_zmq_contexts`` = ``1``
     - (Integer) Number of ZeroMQ contexts, defaults to 1.
   * - ``rpc_zmq_host`` = ``localhost``
@ -44,11 +42,53 @@
     - (String) MatchMaker driver.
   * - ``rpc_zmq_max_port`` = ``65536``
     - (Integer) Maximal port number for random ports range.
-   * - ``rpc_zmq_min_port`` = ``49152``
+   * - ``rpc_zmq_min_port`` = ``49153``
     - (Port number) Minimal port number for random ports range.
+   * - ``rpc_zmq_serialization`` = ``json``
+     - (String) Default serialization mechanism for serializing/deserializing outgoing/incoming messages
   * - ``rpc_zmq_topic_backlog`` = ``None``
     - (Integer) Maximum number of ingress messages to locally buffer per topic. Default is unlimited.
   * - ``use_pub_sub`` = ``True``
     - (Boolean) Use PUB/SUB pattern for fanout methods. PUB/SUB always uses proxy.
-   * - ``zmq_target_expire`` = ``120``
+   * - ``zmq_immediate`` = ``False``
+     - (Boolean) This option configures round-robin mode in zmq socket. True means not keeping a queue when server side disconnects. False means to keep queue and messages even if server is disconnected, when the server appears we send all accumulated messages to it.
+   * - ``zmq_target_expire`` = ``300``
     - (Integer) Expiration timeout in seconds of a name service record about existing target ( < 0 means no timeout).
+   * - ``zmq_target_update`` = ``180``
+     - (Integer) Update period in seconds of a name service record about existing target.
+   * - **[oslo_messaging_zmq]**
+     -
+   * - ``rpc_cast_timeout`` = ``-1``
+     - (Integer) Seconds to wait before a cast expires (TTL). The default value of -1 specifies an infinite linger period. The value of 0 specifies no linger period. Pending messages shall be discarded immediately when the socket is closed. Only supported by impl_zmq.
+   * - ``rpc_poll_timeout`` = ``1``
+     - (Integer) The default number of seconds that poll should wait. Poll raises timeout exception when timeout expired.
+   * - ``rpc_zmq_bind_address`` = ``*``
+     - (String) ZeroMQ bind address. Should be a wildcard (*), an ethernet interface, or IP. The "host" option should point or resolve to this address.
+   * - ``rpc_zmq_bind_port_retries`` = ``100``
+     - (Integer) Number of retries to find free port number before fail with ZMQBindError.
+   * - ``rpc_zmq_contexts`` = ``1``
+     - (Integer) Number of ZeroMQ contexts, defaults to 1.
+   * - ``rpc_zmq_host`` = ``localhost``
+     - (String) Name of this node. Must be a valid hostname, FQDN, or IP address. Must match "host" option, if running Nova.
+   * - ``rpc_zmq_ipc_dir`` = ``/var/run/openstack``
+     - (String) Directory for holding IPC sockets.
+   * - ``rpc_zmq_matchmaker`` = ``redis``
+     - (String) MatchMaker driver.
+   * - ``rpc_zmq_max_port`` = ``65536``
+     - (Integer) Maximal port number for random ports range.
+   * - ``rpc_zmq_min_port`` = ``49153``
+     - (Port number) Minimal port number for random ports range.
+   * - ``rpc_zmq_serialization`` = ``json``
+     - (String) Default serialization mechanism for serializing/deserializing outgoing/incoming messages
+   * - ``rpc_zmq_topic_backlog`` = ``None``
+     - (Integer) Maximum number of ingress messages to locally buffer per topic. Default is unlimited.
+   * - ``use_pub_sub`` = ``True``
+     - (Boolean) Use PUB/SUB pattern for fanout methods. PUB/SUB always uses proxy.
+   * - ``use_router_proxy`` = ``True``
+     - (Boolean) Use ROUTER remote proxy.
+   * - ``zmq_immediate`` = ``False``
+     - (Boolean) This option configures round-robin mode in zmq socket. True means not keeping a queue when server side disconnects. False means to keep queue and messages even if server is disconnected, when the server appears we send all accumulated messages to it.
+   * - ``zmq_target_expire`` = ``300``
+     - (Integer) Expiration timeout in seconds of a name service record about existing target ( < 0 means no timeout).
+   * - ``zmq_target_update`` = ``180``
+     - (Integer) Update period in seconds of a name service record about existing target.
--- a/tools/autogenerate-config-flagmappings/octavia.flagmappings
+++ b/tools/autogenerate-config-flagmappings/octavia.flagmappings
@ -7,6 +7,8 @@ api_paste_config common
 auth_strategy common
 bind_host common
 bind_port common
+conn_pool_min_size disable
+conn_pool_ttl disable
 control_exchange common
 debug disable
 default_log_levels disable
@ -24,7 +26,6 @@ logging_debug_format_suffix disable
 logging_default_format_string disable
 logging_exception_prefix disable
 logging_user_identity_format disable
-memcached_servers cache
 octavia_plugins common
 pagination_max_limit common
 publish_errors disable
@ -35,22 +36,25 @@ rpc_poll_timeout zeromq
 rpc_response_timeout zeromq
 rpc_zmq_bind_address zeromq
 rpc_zmq_bind_port_retries zeromq
-rpc_zmq_concurrency zeromq
 rpc_zmq_contexts zeromq
 rpc_zmq_host zeromq
 rpc_zmq_ipc_dir zeromq
 rpc_zmq_matchmaker zeromq
 rpc_zmq_max_port zeromq
 rpc_zmq_min_port zeromq
+rpc_zmq_serialization zeromq
 rpc_zmq_topic_backlog zeromq
 syslog_log_facility disable
 transport_url rpc
 use_pub_sub zeromq
+use_router_proxy disable
 use_stderr disable
 use_syslog disable
 verbose disable
 watch_log_file disable
+zmq_immediate zeromq
 zmq_target_expire zeromq
+zmq_target_update zeromq
 amphora_agent/agent_server_ca common
 amphora_agent/agent_server_cert common
 amphora_agent/agent_server_network_dir common
@ -71,6 +75,7 @@ certificates/signing_digest common
 certificates/storage_path common
 controller_worker/amp_active_retries common
 controller_worker/amp_active_wait_sec common
+controller_worker/amp_boot_network_list common
 controller_worker/amp_flavor_id common
 controller_worker/amp_image_id common
 controller_worker/amp_image_tag common
@ -155,6 +160,7 @@ house_keeping/cert_expiry_buffer common
 house_keeping/cert_interval common
 house_keeping/cert_rotate_threads common
 house_keeping/cleanup_interval common
+house_keeping/load_balancer_expiry_age common
 house_keeping/spare_amphora_pool_size common
 house_keeping/spare_check_interval common
 keepalived_vrrp/vrrp_advert_int common
@ -213,6 +219,7 @@ matchmaker_redis/socket_timeout redis
 matchmaker_redis/wait_timeout redis
 networking/lb_network_name common
 networking/max_retries common
+networking/port_detach_timeout common
 networking/retry_interval common
 neutron/ca_certificates_file common
 neutron/endpoint common
@ -231,12 +238,29 @@ oslo_concurrency/disable_process_locking rpc
 oslo_concurrency/lock_path rpc
 oslo_messaging/event_stream_topic rpc
 oslo_messaging/topic rpc
+oslo_messaging_amqp/addressing_mode rpc
 oslo_messaging_amqp/allow_insecure_clients rpc
+oslo_messaging_amqp/anycast_address rpc
 oslo_messaging_amqp/broadcast_prefix rpc
+oslo_messaging_amqp/connection_retry_backoff rpc
+oslo_messaging_amqp/connection_retry_interval rpc
+oslo_messaging_amqp/connection_retry_interval_max rpc
 oslo_messaging_amqp/container_name rpc
+oslo_messaging_amqp/default_notification_exchange rpc
+oslo_messaging_amqp/default_notify_timeout rpc
+oslo_messaging_amqp/default_reply_timeout rpc
+oslo_messaging_amqp/default_rpc_exchange rpc
+oslo_messaging_amqp/default_send_timeout rpc
 oslo_messaging_amqp/group_request_prefix rpc
 oslo_messaging_amqp/idle_timeout rpc
+oslo_messaging_amqp/link_retry_delay rpc
+oslo_messaging_amqp/multicast_address rpc
+oslo_messaging_amqp/notify_address_prefix rpc
+oslo_messaging_amqp/notify_server_credit rpc
 oslo_messaging_amqp/password rpc
+oslo_messaging_amqp/reply_link_credit rpc
+oslo_messaging_amqp/rpc_address_prefix rpc
+oslo_messaging_amqp/rpc_server_credit rpc
 oslo_messaging_amqp/sasl_config_dir rpc
 oslo_messaging_amqp/sasl_config_name rpc
 oslo_messaging_amqp/sasl_mechanisms rpc
@ -246,6 +270,7 @@ oslo_messaging_amqp/ssl_cert_file rpc
 oslo_messaging_amqp/ssl_key_file rpc
 oslo_messaging_amqp/ssl_key_password rpc
 oslo_messaging_amqp/trace rpc
+oslo_messaging_amqp/unicast_address rpc
 oslo_messaging_amqp/username rpc
 oslo_messaging_notifications/driver rpc
 oslo_messaging_notifications/topics rpc
@ -253,6 +278,9 @@ oslo_messaging_notifications/transport_url rpc
 oslo_messaging_rabbit/amqp_auto_delete rabbitmq
 oslo_messaging_rabbit/amqp_durable_queues rabbitmq
 oslo_messaging_rabbit/channel_max rabbitmq
+oslo_messaging_rabbit/conn_pool_min_size rabbitmq
+oslo_messaging_rabbit/conn_pool_ttl rabbitmq
+oslo_messaging_rabbit/connection_factory rabbitmq
 oslo_messaging_rabbit/default_notification_exchange rabbitmq
 oslo_messaging_rabbit/default_notification_retry_attempts rabbitmq
 oslo_messaging_rabbit/default_rpc_exchange rabbitmq
@ -306,6 +334,24 @@ oslo_messaging_rabbit/socket_timeout rabbitmq
 oslo_messaging_rabbit/ssl rabbitmq
 oslo_messaging_rabbit/ssl_options rabbitmq
 oslo_messaging_rabbit/tcp_user_timeout rabbitmq
+oslo_messaging_zmq/rpc_cast_timeout zeromq
+oslo_messaging_zmq/rpc_poll_timeout zeromq
+oslo_messaging_zmq/rpc_zmq_bind_address zeromq
+oslo_messaging_zmq/rpc_zmq_bind_port_retries zeromq
+oslo_messaging_zmq/rpc_zmq_contexts zeromq
+oslo_messaging_zmq/rpc_zmq_host zeromq
+oslo_messaging_zmq/rpc_zmq_ipc_dir zeromq
+oslo_messaging_zmq/rpc_zmq_matchmaker zeromq
+oslo_messaging_zmq/rpc_zmq_max_port zeromq
+oslo_messaging_zmq/rpc_zmq_min_port zeromq
+oslo_messaging_zmq/rpc_zmq_serialization zeromq
+oslo_messaging_zmq/rpc_zmq_topic_backlog zeromq
+oslo_messaging_zmq/use_pub_sub zeromq
+oslo_messaging_zmq/use_router_proxy zeromq
+oslo_messaging_zmq/zmq_immediate zeromq
+oslo_messaging_zmq/zmq_target_expire zeromq
+oslo_messaging_zmq/zmq_target_update zeromq
+oslo_middleware/enable_proxy_headers_parsing common
 oslo_middleware/max_request_body_size common
 oslo_middleware/secure_proxy_ssl_header common
 task_flow/engine common