Merge branch 'master' of github.com:biancini/Puppet-Openstack
Merge branch 'master' of github.com:biancini/Puppet-Openstack