Merge "j2 template role config templates"
authorJenkins <jenkins@review.openstack.org>
Tue, 4 Oct 2016 21:40:13 +0000 (21:40 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 4 Oct 2016 21:40:13 +0000 (21:40 +0000)

Trivial merge