24 import sqlalchemy |
24 import sqlalchemy |
25 |
25 |
26 from openstack_common import alter_mysql_tables, create_backups, modify_conf |
26 from openstack_common import alter_mysql_tables, create_backups, modify_conf |
27 |
27 |
28 IRONIC_CONF_MAPPINGS = { |
28 IRONIC_CONF_MAPPINGS = { |
29 # Deprecated group/name |
29 # Deprecated group/name LIBERTY |
30 ('DEFAULT', 'amqp_durable_queues'): |
30 ('DEFAULT', 'rpc_thread_pool_size'): |
31 ('oslo_messaging_qpid', 'amqp_durable_queues'), |
31 ('DEFAULT', 'executor_thread_pool_size'), |
32 ('DEFAULT', 'amqp_auto_delete'): |
|
33 ('oslo_messaging_qpid', 'amqp_auto_delete'), |
|
34 ('DEFAULT', 'rpc_conn_pool_size'): |
|
35 ('oslo_messaging_qpid', 'rpc_conn_pool_size'), |
|
36 ('DEFAULT', 'qpid_hostname'): |
|
37 ('oslo_messaging_qpid', 'qpid_hostname'), |
|
38 ('DEFAULT', 'qpid_port'): |
|
39 ('oslo_messaging_qpid', 'qpid_port'), |
|
40 ('DEFAULT', 'qpid_hosts'): |
|
41 ('oslo_messaging_qpid', 'qpid_hosts'), |
|
42 ('DEFAULT', 'qpid_username'): |
|
43 ('oslo_messaging_qpid', 'qpid_username'), |
|
44 ('DEFAULT', 'qpid_password'): |
|
45 ('oslo_messaging_qpid', 'qpid_password'), |
|
46 ('DEFAULT', 'qpid_sasl_mechanisms'): |
|
47 ('oslo_messaging_qpid', 'qpid_sasl_mechanisms'), |
|
48 ('DEFAULT', 'qpid_tcp_nodelay'): |
|
49 ('oslo_messaging_qpid', 'qpid_tcp_nodelay'), |
|
50 ('DEFAULT', 'qpid_heartbeat'): |
|
51 ('oslo_messaging_qpid', 'qpid_heartbeat'), |
|
52 ('DEFAULT', 'qpid_protocol'): |
|
53 ('oslo_messaging_qpid', 'qpid_protocol'), |
|
54 ('DEFAULT', 'qpid_receiver_capacity'): |
|
55 ('oslo_messaging_qpid', 'qpid_receiver_capacity'), |
|
56 ('DEFAULT', 'qpid_topology_version'): |
|
57 ('oslo_messaging_qpid', 'qpid_topology_version'), |
|
58 ('DEFAULT', 'kombu_ssl_version'): |
|
59 ('oslo_messaging_rabbit', 'kombu_ssl_version'), |
|
60 ('DEFAULT', 'kombu_ssl_keyfile'): |
|
61 ('oslo_messaging_rabbit', 'kombu_ssl_keyfile'), |
|
62 ('DEFAULT', 'kombu_ssl_certfile'): |
|
63 ('oslo_messaging_rabbit', 'kombu_ssl_certfile'), |
|
64 ('DEFAULT', 'kombu_ssl_ca_certs'): |
|
65 ('oslo_messaging_rabbit', 'kombu_ssl_ca_certs'), |
|
66 ('DEFAULT', 'kombu_reconnect_delay'): |
|
67 ('oslo_messaging_rabbit', 'kombu_reconnect_delay'), |
|
68 ('DEFAULT', 'rabbit_host'): |
|
69 ('oslo_messaging_rabbit', 'rabbit_host'), |
|
70 ('DEFAULT', 'rabbit_port'): |
|
71 ('oslo_messaging_rabbit', 'rabbit_port'), |
|
72 ('DEFAULT', 'rabbit_hosts'): |
|
73 ('oslo_messaging_rabbit', 'rabbit_hosts'), |
|
74 ('DEFAULT', 'rabbit_use_ssl'): |
|
75 ('oslo_messaging_rabbit', 'rabbit_use_ssl'), |
|
76 ('DEFAULT', 'rabbit_userid'): |
|
77 ('oslo_messaging_rabbit', 'rabbit_userid'), |
|
78 ('DEFAULT', 'rabbit_password'): |
|
79 ('oslo_messaging_rabbit', 'rabbit_password'), |
|
80 ('DEFAULT', 'rabbit_login_method'): |
|
81 ('oslo_messaging_rabbit', 'rabbit_login_method'), |
|
82 ('DEFAULT', 'rabbit_virtual_host'): |
|
83 ('oslo_messaging_rabbit', 'rabbit_virtual_host'), |
|
84 ('DEFAULT', 'rabbit_retry_interval'): |
|
85 ('oslo_messaging_rabbit', 'rabbit_retry_interval'), |
|
86 ('DEFAULT', 'rabbit_retry_backoff'): |
|
87 ('oslo_messaging_rabbit', 'rabbit_retry_backoff'), |
|
88 ('DEFAULT', 'rabbit_max_retries'): |
|
89 ('oslo_messaging_rabbit', 'rabbit_max_retries'), |
|
90 ('DEFAULT', 'rabbit_ha_queues'): |
|
91 ('oslo_messaging_rabbit', 'rabbit_ha_queues'), |
|
92 ('DEFAULT', 'fake_rabbit'): |
|
93 ('oslo_messaging_rabbit', 'fake_rabbit'), |
|
94 ('keystone_authtoken', 'admin_token'): (None, None), |
|
95 ('keystone_authtoken', 'auth_admin_prefix'): (None, None), |
|
96 ('DEFAULT', 'log_format'): (None, None), |
32 ('DEFAULT', 'log_format'): (None, None), |
97 ('DEFAULT', 'fake_rabbit'): (None, None), |
33 ('DEFAULT', 'use_syslog'): (None, None), |
|
34 ('agent', 'agent_pxe_append_params'): (None, None), |
|
35 ('agent', 'agent_erase_devices_priority'): |
|
36 ('deploy', 'erase_devices_priority'), |
|
37 ('agent', 'agent_pxe_config_template'): (None, None), |
|
38 ('agent', 'manage_tftp'): ('agent', 'manage_agent_boot'), |
|
39 # Deprecated group/name MITAKA |
|
40 ('profiler', 'profiler_enabled'): ('profiler', 'enabled'), |
98 } |
41 } |
99 |
42 |
100 IRONIC_CONF_EXCEPTIONS = [ |
43 IRONIC_CONF_EXCEPTIONS = [ |
|
44 ('DEFAULT', 'auth_strategy'), |
|
45 ('DEFAULT', 'enabled_drivers'), |
|
46 ('DEFAULT', 'pybasedir'), |
|
47 ('DEFAULT', 'bindir'), |
|
48 ('DEFAULT', 'state_path'), |
|
49 ('ai', 'server'), |
|
50 ('ai', 'username'), |
|
51 ('api', 'api_workers'), |
|
52 ('database', 'connection'), |
101 ('keystone_authtoken', 'admin_tenant_name'), |
53 ('keystone_authtoken', 'admin_tenant_name'), |
102 ('keystone_authtoken', 'admin_user'), |
54 ('keystone_authtoken', 'admin_user'), |
103 ('keystone_authtoken', 'admin_password'), |
55 ('keystone_authtoken', 'admin_password'), |
|
56 ('keystone_authtoken', 'auth_host'), |
|
57 ('keystone_authtoken', 'auth_uri'), |
|
58 ('keystone_authtoken', 'identity_uri'), |
104 ('keystone_authtoken', 'signing_dir'), |
59 ('keystone_authtoken', 'signing_dir'), |
105 ('ai', 'server'), |
60 ('solaris_ipmi', 'imagecache_dirname'), |
106 ('ai', 'username'), |
61 ('solaris_ipmi', 'imagecache_lock_timeout'), |
107 ] |
62 ] |
108 |
63 |
109 |
64 |
110 def start(): |
65 def start(): |
111 # pull out the current version of config/upgrade-id |
66 # pull out the current version of config/upgrade-id |