Yet another similar trick to https://review.openstack.org/#/c/63001/

Change-Id: I50ee7af16e12c52292228393d97d00ff56cf4236
Correctly initialize adminPass if using the default image

Change-Id: I477808c9a3ddb31cf81a31b24628400846b2b871