Merge "j2 template per-role things in default registry"
authorJenkins <jenkins@review.openstack.org>
Thu, 29 Sep 2016 14:56:56 +0000 (14:56 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 29 Sep 2016 14:56:56 +0000 (14:56 +0000)

Trivial merge