This reverts commit 8e96a91ffae745b952c053923aa177e615b49b74.
Reason for revert: The change broke the compute-kit tests.
The deployment of all Openstack components is successful but then when we create networks and a VM, neutron-dhcp-agent crashes. It is still not clear why it happens. Let's revert this change and figure out what is going on.
Change-Id: I07082511cd168560c8fe8dce3421e37fc402a1ae