3625bda6f8
This reverts the grenade job driver changes from commit fa850c80cbc701f1252dabcd3f514bca0148f54d. Local config settings in the grenade jobs are used for the previous version (old) devstack plugin in the grenade run. So the local config defined here must match how we want the old devstack setup, not the current (new) devstack. Change-Id: I3d5aa1da6879a0c624b5196632886da32e12d7d7