This reverts commit 7be0b04
This work breaks the ability to do multi database installs,
revert until there is a working solution here, as this is going
to make fixing postgresql in tempest impossible.
Change-Id: I39a2b78542fe60233806d1005186ce1b31d4be17