Merge "use openstack command instead of nova command"