Merge "Rename -puppet.yaml templates."
authorJenkins <jenkins@review.openstack.org>
Fri, 25 Sep 2015 14:58:42 +0000 (14:58 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 25 Sep 2015 14:58:42 +0000 (14:58 +0000)

Trivial merge