Update sahara flagmappings for Ocata

These are all oslo_messaging_rabbit config options that have been
renamed.

Change-Id: Idc9f1b30f150b9cd7072cc78569171ec297755fb

tools/autogenerate-config-flagmappings/sahara.flagmappings

@@ -22,7 +22,6 @@ global_remote_threshold common
 hash_ring_replicas_count common
 heat_enable_wait_condition common
 heat_stack_tags common
-image common
 instance_format disable
 instance_uuid_format disable
 job_binary_max_KB common
@@ -51,14 +50,21 @@ proxy_command common
 proxy_user_domain_name domain
 proxy_user_role_names domain
 publish_errors disable
+rate_limit_burst disable
+rate_limit_except_level disable
+rate_limit_interval disable
 remote common
-root_fs common
 rootwrap_command common
+rpc_ack_timeout_base disable
+rpc_ack_timeout_multiplier disable
 rpc_backend disable
-rpc_cast_timeout disable
 rpc_conn_pool_size disable
+rpc_message_ttl disable
 rpc_poll_timeout disable
 rpc_response_timeout disable
+rpc_retry_attempts disable
+rpc_thread_pool_size disable
+rpc_use_acks disable
 rpc_zmq_bind_address disable
 rpc_zmq_bind_port_retries disable
 rpc_zmq_contexts disable
@@ -72,13 +78,14 @@ rpc_zmq_topic_backlog disable
 ssh_timeout_common ssh
 ssh_timeout_files ssh
 ssh_timeout_interactive ssh
+subscribe_on disable
 swift_topology_file common
 syslog_log_facility disable
-test_only common
 transport_url disable
 use_barbican_key_manager common
 use_designate common
 use_domain_for_proxy_users domain
+use_dynamic_connections disable
 use_floating_ips common
 use_identity_api_v3 common
 use_namespaces common
@@ -90,9 +97,15 @@ use_stderr disable
 use_syslog disable
 verbose disable
 watch_log_file disable
+zmq_failover_connections disable
 zmq_immediate disable
+zmq_linger disable
 zmq_target_expire disable
 zmq_target_update disable
+zmq_tcp_keepalive disable
+zmq_tcp_keepalive_cnt disable
+zmq_tcp_keepalive_idle disable
+zmq_tcp_keepalive_intvl disable
 castellan/barbican_api_endpoint common
 castellan/barbican_api_version common
 cinder/api_insecure clients
@@ -137,6 +150,11 @@ database/use_db_reconnect disable
 glance/api_insecure clients
 glance/ca_file clients
 glance/endpoint_type clients
+healthcheck/backends common
+healthcheck/detailed common
+healthcheck/disable_by_file_path common
+healthcheck/disable_by_file_paths common
+healthcheck/path common
 heat/api_insecure clients
 heat/ca_file clients
 heat/endpoint_type clients
@@ -179,6 +197,8 @@ keystone_authtoken/memcache_use_advanced_pool disable
 keystone_authtoken/memcached_servers disable
 keystone_authtoken/region_name disable
 keystone_authtoken/revocation_cache_time disable
+keystone_authtoken/service_token_roles disable
+keystone_authtoken/service_token_roles_required disable
 keystone_authtoken/signing_dir disable
 keystone_authtoken/token_cache_time disable
 manila/api_insecure clients
@@ -212,9 +232,11 @@ oslo_messaging_amqp/connection_retry_interval_max disable
 oslo_messaging_amqp/container_name disable
 oslo_messaging_amqp/default_notification_exchange disable
 oslo_messaging_amqp/default_notify_timeout disable
+oslo_messaging_amqp/default_reply_retry disable
 oslo_messaging_amqp/default_reply_timeout disable
 oslo_messaging_amqp/default_rpc_exchange disable
 oslo_messaging_amqp/default_send_timeout disable
+oslo_messaging_amqp/default_sender_link_timeout disable
 oslo_messaging_amqp/group_request_prefix disable
 oslo_messaging_amqp/idle_timeout disable
 oslo_messaging_amqp/link_retry_delay disable
@@ -222,6 +244,7 @@ oslo_messaging_amqp/multicast_address disable
 oslo_messaging_amqp/notify_address_prefix disable
 oslo_messaging_amqp/notify_server_credit disable
 oslo_messaging_amqp/password disable
+oslo_messaging_amqp/pre_settled disable
 oslo_messaging_amqp/reply_link_credit disable
 oslo_messaging_amqp/rpc_address_prefix disable
 oslo_messaging_amqp/rpc_server_credit disable
@@ -236,8 +259,17 @@ oslo_messaging_amqp/ssl_key_password disable
 oslo_messaging_amqp/trace disable
 oslo_messaging_amqp/unicast_address disable
 oslo_messaging_amqp/username disable
+oslo_messaging_kafka/conn_pool_min_size disable
+oslo_messaging_kafka/conn_pool_ttl disable
+oslo_messaging_kafka/consumer_group disable
+oslo_messaging_kafka/kafka_consumer_timeout disable
+oslo_messaging_kafka/kafka_default_host disable
+oslo_messaging_kafka/kafka_default_port disable
+oslo_messaging_kafka/kafka_max_fetch_bytes disable
+oslo_messaging_kafka/pool_size disable
+oslo_messaging_kafka/producer_batch_size disable
+oslo_messaging_kafka/producer_batch_timeout disable
 oslo_messaging_notifications/driver disable
-oslo_messaging_notifications/enable disable
 oslo_messaging_notifications/level disable
 oslo_messaging_notifications/publisher_id disable
 oslo_messaging_notifications/topics disable
@@ -250,6 +282,7 @@ oslo_messaging_rabbit/default_notification_exchange disable
 oslo_messaging_rabbit/default_notification_retry_attempts disable
 oslo_messaging_rabbit/default_rpc_exchange disable
 oslo_messaging_rabbit/default_rpc_retry_attempts disable
+oslo_messaging_rabbit/default_serializer_type disable
 oslo_messaging_rabbit/fake_rabbit disable
 oslo_messaging_rabbit/frame_max disable
 oslo_messaging_rabbit/heartbeat_interval disable
@@ -260,10 +293,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
@@ -284,7 +313,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
@@ -296,10 +324,19 @@ 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_cast_timeout disable
+oslo_messaging_zmq/rpc_ack_timeout_base disable
+oslo_messaging_zmq/rpc_ack_timeout_multiplier disable
+oslo_messaging_zmq/rpc_message_ttl disable
 oslo_messaging_zmq/rpc_poll_timeout disable
+oslo_messaging_zmq/rpc_retry_attempts disable
+oslo_messaging_zmq/rpc_thread_pool_size disable
+oslo_messaging_zmq/rpc_use_acks disable
 oslo_messaging_zmq/rpc_zmq_bind_address disable
 oslo_messaging_zmq/rpc_zmq_bind_port_retries disable
 oslo_messaging_zmq/rpc_zmq_contexts disable
@@ -310,11 +347,19 @@ oslo_messaging_zmq/rpc_zmq_max_port disable
 oslo_messaging_zmq/rpc_zmq_min_port disable
 oslo_messaging_zmq/rpc_zmq_serialization disable
 oslo_messaging_zmq/rpc_zmq_topic_backlog disable
+oslo_messaging_zmq/subscribe_on disable
+oslo_messaging_zmq/use_dynamic_connections disable
 oslo_messaging_zmq/use_pub_sub disable
 oslo_messaging_zmq/use_router_proxy disable
+oslo_messaging_zmq/zmq_failover_connections disable
 oslo_messaging_zmq/zmq_immediate disable
+oslo_messaging_zmq/zmq_linger disable
 oslo_messaging_zmq/zmq_target_expire disable
 oslo_messaging_zmq/zmq_target_update disable
+oslo_messaging_zmq/zmq_tcp_keepalive disable
+oslo_messaging_zmq/zmq_tcp_keepalive_cnt disable
+oslo_messaging_zmq/zmq_tcp_keepalive_idle disable
+oslo_messaging_zmq/zmq_tcp_keepalive_intvl disable
 oslo_middleware/enable_proxy_headers_parsing api
 oslo_middleware/max_request_body_size api
 oslo_middleware/secure_proxy_ssl_header api