Merge branch 'master' of https://github.com/rthallisey/puppet-nova
Merge branch 'master' of https://github.com/rthallisey/puppet-nova