Minor changes to osd-prep.sh for testing
Merge branch 'master' of https://github.com/bclarkindy/openstack-deploy