reset git
Merge branch 'master' of https://github.com/longgeek/OpenStack-Source-Puppet-Install-Folsom