--- a/components/openstack/cinder/files/cinder-upgrade Tue Apr 28 11:51:13 2015 -0700
+++ b/components/openstack/cinder/files/cinder-upgrade Tue Apr 28 14:22:38 2015 -0700
@@ -43,6 +43,9 @@
('DEFAULT', 'logdir'): ('DEFAULT', 'log_dir'),
('DEFAULT', 'num_iscsi_scan_tries'):
('DEFAULT', 'num_volume_device_scan_tries'),
+ ('DEFAULT', 'zfssa_host'): ('DEFAULT', 'san_ip'),
+ ('DEFAULT', 'zfssa_auth_user'): ('DEFAULT', 'san_login'),
+ ('DEFAULT', 'zfssa_auth_password'): ('DEFAULT', 'san_password'),
('DEFAULT', 'db_backend'): ('database', 'backend'),
('DEFAULT', 'sql_connection'): ('database', 'connection'),
('DATABASE', 'sql_connection'): ('database', 'connection'),