--- a/components/openstack/cinder/files/cinder-upgrade	Mon Apr 04 12:46:34 2016 -0700
+++ b/components/openstack/cinder/files/cinder-upgrade	Mon Apr 04 12:55:04 2016 -0700
@@ -35,6 +35,70 @@
     ('DEFAULT', 'eqlx_chap_login'): ('DEFAULT', 'chap_username'),
     ('DEFAULT', 'host'): ('DEFAULT', 'backend_host'),
     ('DEFAULT', 'db_backend'): ('database', 'backend'),
+    ('DEFAULT', 'qpid_hostname'):
+        ('oslo_messaging_qpid', 'qpid_hostname'),
+    ('DEFAULT', 'qpid_port'):
+        ('oslo_messaging_qpid', 'qpid_port'),
+    ('DEFAULT', 'qpid_hosts'):
+        ('oslo_messaging_qpid', 'qpid_hosts'),
+    ('DEFAULT', 'qpid_username'):
+        ('oslo_messaging_qpid', 'qpid_username'),
+    ('DEFAULT', 'qpid_password'):
+        ('oslo_messaging_qpid', 'qpid_password'),
+    ('DEFAULT', 'qpid_sasl_mechanisms'):
+        ('oslo_messaging_qpid', 'qpid_sasl_mechanisms'),
+    ('DEFAULT', 'qpid_heartbeat'):
+        ('oslo_messaging_qpid', 'qpid_heartbeat'),
+    ('DEFAULT', 'qpid_protocol'):
+        ('oslo_messaging_qpid', 'qpid_protocol'),
+    ('DEFAULT', 'qpid_tcp_nodelay'):
+        ('oslo_messaging_qpid', 'qpid_tcp_nodelay'),
+    ('DEFAULT', 'qpid_receiver_capacity'):
+        ('oslo_messaging_qpid', 'qpid_receiver_capacity'),
+    ('DEFAULT', 'qpid_topology_version'):
+        ('oslo_messaging_qpid', 'qpid_topology_version'),
+    ('DEFAULT', 'amqp_durable_queues'):
+        ('oslo_messaging_rabbit', 'amqp_durable_queues'),
+    ('DEFAULT', 'amqp_auto_delete'):
+        ('oslo_messaging_rabbit', 'amqp_auto_delete'),
+    ('DEFAULT', 'rpc_conn_pool_size'):
+        ('oslo_messaging_rabbit', 'rpc_conn_pool_size'),
+    ('DEFAULT', 'kombu_ssl_version'):
+        ('oslo_messaging_rabbit', 'kombu_ssl_version'),
+    ('DEFAULT', 'kombu_ssl_keyfile'):
+        ('oslo_messaging_rabbit', 'kombu_ssl_keyfile'),
+    ('DEFAULT', 'kombu_ssl_certfile'):
+        ('oslo_messaging_rabbit', 'kombu_ssl_certfile'),
+    ('DEFAULT', 'kombu_ssl_ca_certs'):
+        ('oslo_messaging_rabbit', 'kombu_ssl_ca_certs'),
+    ('DEFAULT', 'kombu_reconnect_delay'):
+        ('oslo_messaging_rabbit', 'kombu_reconnect_delay'),
+    ('DEFAULT', 'rabbit_host'):
+        ('oslo_messaging_rabbit', 'rabbit_host'),
+    ('DEFAULT', 'rabbit_port'):
+        ('oslo_messaging_rabbit', 'rabbit_port'),
+    ('DEFAULT', 'rabbit_hosts'):
+        ('oslo_messaging_rabbit', 'rabbit_hosts'),
+    ('DEFAULT', 'rabbit_use_ssl'):
+        ('oslo_messaging_rabbit', 'rabbit_use_ssl'),
+    ('DEFAULT', 'rabbit_userid'):
+        ('oslo_messaging_rabbit', 'rabbit_userid'),
+    ('DEFAULT', 'rabbit_password'):
+        ('oslo_messaging_rabbit', 'rabbit_password'),
+    ('DEFAULT', 'rabbit_login_method'):
+        ('oslo_messaging_rabbit', 'rabbit_login_method'),
+    ('DEFAULT', 'rabbit_virtual_host'):
+        ('oslo_messaging_rabbit', 'rabbit_virtual_host'),
+    ('DEFAULT', 'rabbit_retry_interval'):
+        ('oslo_messaging_rabbit', 'rabbit_retry_interval'),
+    ('DEFAULT', 'rabbit_retry_backoff'):
+        ('oslo_messaging_rabbit', 'rabbit_retry_backoff'),
+    ('DEFAULT', 'rabbit_max_retries'):
+        ('oslo_messaging_rabbit', 'rabbit_max_retries'),
+    ('DEFAULT', 'rabbit_ha_queues'):
+        ('oslo_messaging_rabbit', 'rabbit_ha_queues'),
+    ('DEFAULT', 'fake_rabbit'):
+        ('oslo_messaging_rabbit', 'fake_rabbit'),
     ('DEFAULT', 'osapi_max_request_body_size'):
         ('oslo_middleware', 'max_request_body_size'),
     ('DEFAULT', 'log-format'): (None, None),