Merge "Replace cinder client calls with openstack sdk"