modified not to use the extra server on the openstack.