CFY-1230 fixed openstack handler