Ensure Nova Network-compatible provisioning

Conflicts:
	manifests/provision.pp

Cherry-picked from 050fa67b230b320e096c3a66420f692cd1adf69b in master.

Change-Id: If5e05b54aa8cff01a6b48ee1c3bcb951758fff95