Backport remove openstack