Merge "Use --os-endpoint-type for Cinder CLI"