Clean up configure_nova() a bit

Change-Id: I2228221051a5a4413a34ca359856d90794fce69a
Merge branch 'database-service' into dt-test