Fixing faulty defaults from 3f98d8f

We can't currently bring up a devstack from scratch, because these variables are undefined. This should avoid those errors, introduced in 3f98d8f

@e0d can you review?