diff --git a/tools/autogenerate-config-flagmappings/ironic.flagmappings b/tools/autogenerate-config-flagmappings/ironic.flagmappings
new file mode 100644
index 0000000000..813e3c57bc
--- /dev/null
+++ b/tools/autogenerate-config-flagmappings/ironic.flagmappings
@@ -0,0 +1,241 @@
+amqp_auto_delete amqp
+amqp_durable_queues amqp
+auth_strategy auth
+backdoor_port debug
+bindir common
+control_exchange amqp
+debug logging
+default_log_levels logging
+enabled_drivers common
+fatal_deprecations common
+fatal_exception_format_errors logging
+force_raw_images common
+hash_distribution_replicas common
+hash_partition_exponent common
+host common
+instance_format logging
+instance_uuid_format logging
+isolinux_bin common
+isolinux_config_template common
+kombu_reconnect_delay rabbitmq
+kombu_ssl_ca_certs rabbitmq
+kombu_ssl_certfile rabbitmq
+kombu_ssl_keyfile rabbitmq
+kombu_ssl_version rabbitmq
+log_config_append logging
+log_date_format logging
+log_dir logging
+log_file logging
+log_format logging
+logging_context_format_string logging
+logging_debug_format_suffix logging
+logging_default_format_string logging
+logging_exception_prefix logging
+matchmaker_heartbeat_freq rpc
+matchmaker_heartbeat_ttl rpc
+memcached_servers common
+my_ip common
+notification_driver amqp
+notification_topics amqp
+parallel_image_downloads common
+periodic_interval common
+policy_default_rule policy
+policy_file policy
+publish_errors logging
+pybasedir common
+qpid_heartbeat qpid
+qpid_hostname qpid
+qpid_hosts qpid
+qpid_password qpid
+qpid_port qpid
+qpid_protocol qpid
+qpid_receiver_capacity qpid
+qpid_sasl_mechanisms qpid
+qpid_tcp_nodelay qpid
+qpid_topology_version qpid
+qpid_username qpid
+rabbit_ha_queues rabbitmq
+rabbit_host rabbitmq
+rabbit_hosts rabbitmq
+rabbit_login_method rabbitmq
+rabbit_max_retries rabbitmq
+rabbit_password rabbitmq
+rabbit_port rabbitmq
+rabbit_retry_backoff rabbitmq
+rabbit_retry_interval rabbitmq
+rabbit_use_ssl rabbitmq
+rabbit_userid rabbitmq
+rabbit_virtual_host rabbitmq
+rootwrap_config common
+rpc_backend rpc
+rpc_cast_timeout rpc
+rpc_conn_pool_size rpc
+rpc_response_timeout rpc
+rpc_thread_pool_size rpc
+rpc_zmq_bind_address zeromq
+rpc_zmq_contexts zeromq
+rpc_zmq_host zeromq
+rpc_zmq_ipc_dir zeromq
+rpc_zmq_matchmaker zeromq
+rpc_zmq_port zeromq
+rpc_zmq_topic_backlog zeromq
+run_external_periodic_tasks common
+state_path common
+syslog_log_facility logging
+tempdir common
+transport_url amqp
+use_stderr logging
+use_syslog logging
+use_syslog_rfc_format logging
+verbose logging
+agent/agent_api_version agent
+agent/agent_pxe_append_params agent
+agent/agent_pxe_bootfile_name agent
+agent/agent_pxe_config_template agent
+agent/heartbeat_timeout agent
+api/host_ip api
+api/max_limit api
+api/port api
+conductor/api_url conductor
+conductor/check_provision_state_interval conductor
+conductor/deploy_callback_timeout conductor
+conductor/force_power_state_during_sync conductor
+conductor/heartbeat_interval conductor
+conductor/heartbeat_timeout conductor
+conductor/node_locked_retry_attempts conductor
+conductor/node_locked_retry_interval conductor
+conductor/periodic_max_workers conductor
+conductor/power_state_sync_max_retries conductor
+conductor/send_sensor_data conductor
+conductor/send_sensor_data_interval conductor
+conductor/send_sensor_data_types conductor
+conductor/sync_local_state_interval conductor
+conductor/sync_power_state_interval conductor
+conductor/workers_pool_size conductor
+console/subprocess_checking_interval console
+console/subprocess_timeout console
+console/terminal console
+console/terminal_cert_dir console
+console/terminal_pid_dir console
+database/backend database
+database/connection database
+database/connection_debug database
+database/connection_trace database
+database/db_inc_retry_interval database
+database/db_max_retries database
+database/db_max_retry_interval database
+database/db_retry_interval database
+database/idle_timeout database
+database/max_overflow database
+database/max_pool_size database
+database/max_retries database
+database/min_pool_size database
+database/mysql_engine database
+database/mysql_sql_mode database
+database/pool_timeout database
+database/retry_interval database
+database/slave_connection database
+database/sqlite_db database
+database/sqlite_synchronous database
+database/use_db_reconnect database
+dhcp/dhcp_provider dhcp
+disk_partitioner/check_device_interval disk_partitioner
+disk_partitioner/check_device_max_retries disk_partitioner
+glance/allowed_direct_url_schemes glance
+glance/auth_strategy glance
+glance/glance_api_insecure glance
+glance/glance_api_servers glance
+glance/glance_host glance
+glance/glance_num_retries glance
+glance/glance_port glance
+glance/glance_protocol glance
+glance/swift_account glance
+glance/swift_api_version glance
+glance/swift_container glance
+glance/swift_endpoint_url glance
+glance/swift_temp_url_duration glance
+glance/swift_temp_url_key glance
+ilo/client_port ilo
+ilo/client_timeout ilo
+ilo/power_retry ilo
+ilo/power_wait ilo
+ilo/swift_ilo_container ilo
+ilo/swift_object_expiry_timeout ilo
+ipmi/min_command_interval ipmi
+ipmi/retry_timeout ipmi
+keystone_authtoken/admin_password auth_token
+keystone_authtoken/admin_tenant_name auth_token
+keystone_authtoken/admin_token auth_token
+keystone_authtoken/admin_user auth_token
+keystone_authtoken/auth_admin_prefix auth_token
+keystone_authtoken/auth_host auth_token
+keystone_authtoken/auth_port auth_token
+keystone_authtoken/auth_protocol auth_token
+keystone_authtoken/auth_uri auth_token
+keystone_authtoken/auth_version auth_token
+keystone_authtoken/cache auth_token
+keystone_authtoken/cafile auth_token
+keystone_authtoken/certfile auth_token
+keystone_authtoken/check_revocations_for_cached auth_token
+keystone_authtoken/delay_auth_decision auth_token
+keystone_authtoken/enforce_token_bind auth_token
+keystone_authtoken/hash_algorithms auth_token
+keystone_authtoken/http_connect_timeout auth_token
+keystone_authtoken/http_request_max_retries auth_token
+keystone_authtoken/identity_uri auth_token
+keystone_authtoken/include_service_catalog auth_token
+keystone_authtoken/insecure auth_token
+keystone_authtoken/keyfile auth_token
+keystone_authtoken/memcache_pool_conn_get_timeout auth_token
+keystone_authtoken/memcache_pool_dead_retry auth_token
+keystone_authtoken/memcache_pool_maxsize auth_token
+keystone_authtoken/memcache_pool_socket_timeout auth_token
+keystone_authtoken/memcache_pool_unused_timeout auth_token
+keystone_authtoken/memcache_secret_key auth_token
+keystone_authtoken/memcache_security_strategy auth_token
+keystone_authtoken/memcache_use_advanced_pool auth_token
+keystone_authtoken/memcached_servers auth_token
+keystone_authtoken/revocation_cache_time auth_token
+keystone_authtoken/signing_dir auth_token
+keystone_authtoken/token_cache_time auth_token
+matchmaker_redis/host redis
+matchmaker_redis/password redis
+matchmaker_redis/port redis
+matchmaker_ring/ringfile redis
+neutron/auth_strategy neutron
+neutron/url neutron
+neutron/url_timeout neutron
+oslo_messaging_amqp/allow_insecure_clients amqp
+oslo_messaging_amqp/broadcast_prefix amqp
+oslo_messaging_amqp/container_name amqp
+oslo_messaging_amqp/group_request_prefix amqp
+oslo_messaging_amqp/idle_timeout amqp
+oslo_messaging_amqp/server_request_prefix amqp
+oslo_messaging_amqp/ssl_ca_file ca
+oslo_messaging_amqp/ssl_cert_file ca
+oslo_messaging_amqp/ssl_key_file ca
+oslo_messaging_amqp/ssl_key_password ca
+oslo_messaging_amqp/trace amqp
+pxe/default_ephemeral_format pxe
+pxe/disk_devices pxe
+pxe/http_root pxe
+pxe/http_url pxe
+pxe/image_cache_size pxe
+pxe/image_cache_ttl pxe
+pxe/images_path pxe
+pxe/instance_master_path pxe
+pxe/ipxe_boot_script pxe
+pxe/ipxe_enabled pxe
+pxe/pxe_append_params pxe
+pxe/pxe_bootfile_name pxe
+pxe/pxe_config_template pxe
+pxe/tftp_master_path pxe
+pxe/tftp_root pxe
+pxe/tftp_server pxe
+pxe/uefi_pxe_bootfile_name pxe
+pxe/uefi_pxe_config_template pxe
+seamicro/action_timeout seamicro
+seamicro/max_retry seamicro
+snmp/power_timeout snmp
+ssh/libvirt_uri ssh
+swift/swift_max_retries swift
diff --git a/tools/autogenerate-config-flagmappings/ironic.headers b/tools/autogenerate-config-flagmappings/ironic.headers
new file mode 100644
index 0000000000..7cd915bdf5
--- /dev/null
+++ b/tools/autogenerate-config-flagmappings/ironic.headers
@@ -0,0 +1,12 @@
+agent agent
+conductor conductor
+console console
+dhcp DHCP
+disk_partitioner disk partitioner
+ilo ILO
+ipmi IPMI
+neutron neutron
+seamicro SeaMicro
+snmp SNMP
+ssh SSH
+pxe PXE