[nova][cinder] Update to support vmware
Merge branch 'master' of github.com:redhat-openstack/openstack-puppet-modules