diff --git a/tools/autogenerate-config-flagmappings/ironic.flagmappings b/tools/autogenerate-config-flagmappings/ironic.flagmappings
index 3e4066248c..6ff006256c 100644
--- a/tools/autogenerate-config-flagmappings/ironic.flagmappings
+++ b/tools/autogenerate-config-flagmappings/ironic.flagmappings
@@ -446,10 +446,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
@@ -470,7 +466,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
@@ -482,7 +477,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