Add a couple of missing steps to complete a Vagrant deployment. In
the case of the multi-node deployment we could go one step further
and ensure that the supplied inventory matches the default set of
nodes created by Vagrant.

Change-Id: Iee878e26989e92e4de06c071704a6794011b6e58