Ensure Nova Network-compatible provisioning

Change-Id: If5e05b54aa8cff01a6b48ee1c3bcb951758fff95
Closes-Bug: #1242668
Merge git://github.com/puppetlabs/puppetlabs-openstack