From 85373d3aa14f4a4bb61570c323499226ec75aa5e Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Tue, 4 Apr 2017 11:53:22 +0100 Subject: [PATCH] Update zaqar flagmappings This involved manually updating 'zaqar/requirements.txt' to exclude requests 2.13.0, preventing a requirements conflict with oslo.config. Change-Id: I20846b9d9a176ca0084bfbb8284f52afa1f91590 --- .../zaqar.flagmappings | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/autogenerate-config-flagmappings/zaqar.flagmappings b/tools/autogenerate-config-flagmappings/zaqar.flagmappings index 0b91f82cff..9552f3d0d6 100644 --- a/tools/autogenerate-config-flagmappings/zaqar.flagmappings +++ b/tools/autogenerate-config-flagmappings/zaqar.flagmappings @@ -166,9 +166,12 @@ matchmaker_redis/sentinel_group_name redis matchmaker_redis/sentinel_hosts redis matchmaker_redis/socket_timeout redis matchmaker_redis/wait_timeout redis +notification/external_confirmation_url api notification/max_notifier_workers api notification/require_confirmation api notification/smtp_command api +notification/subscription_confirmation_email_template api +notification/unsubscribe_confirmation_email_template api oslo_concurrency/disable_process_locking disable oslo_concurrency/lock_path disable oslo_messaging_amqp/addressing_mode disable @@ -240,10 +243,6 @@ oslo_messaging_rabbit/kombu_compression disable oslo_messaging_rabbit/kombu_failover_strategy disable oslo_messaging_rabbit/kombu_missing_consumer_retry_timeout disable oslo_messaging_rabbit/kombu_reconnect_delay disable -oslo_messaging_rabbit/kombu_ssl_ca_certs disable -oslo_messaging_rabbit/kombu_ssl_certfile disable -oslo_messaging_rabbit/kombu_ssl_keyfile disable -oslo_messaging_rabbit/kombu_ssl_version disable oslo_messaging_rabbit/notification_listener_prefetch_count disable oslo_messaging_rabbit/notification_persistence disable oslo_messaging_rabbit/notification_retry_delay disable @@ -264,7 +263,6 @@ oslo_messaging_rabbit/rabbit_qos_prefetch_count disable oslo_messaging_rabbit/rabbit_retry_backoff disable oslo_messaging_rabbit/rabbit_retry_interval disable oslo_messaging_rabbit/rabbit_transient_queues_ttl disable -oslo_messaging_rabbit/rabbit_use_ssl disable oslo_messaging_rabbit/rabbit_userid disable oslo_messaging_rabbit/rabbit_virtual_host disable oslo_messaging_rabbit/rpc_listener_prefetch_count disable @@ -276,7 +274,11 @@ oslo_messaging_rabbit/rpc_reply_retry_delay disable oslo_messaging_rabbit/rpc_retry_delay disable oslo_messaging_rabbit/socket_timeout disable oslo_messaging_rabbit/ssl disable +oslo_messaging_rabbit/ssl_ca_file disable +oslo_messaging_rabbit/ssl_cert_file disable +oslo_messaging_rabbit/ssl_key_file disable oslo_messaging_rabbit/ssl_options disable +oslo_messaging_rabbit/ssl_version disable oslo_messaging_rabbit/tcp_user_timeout disable oslo_messaging_zmq/rpc_ack_timeout_base disable oslo_messaging_zmq/rpc_ack_timeout_multiplier disable