Merge "Convert controller-role.yaml to role.role.j2.yaml"
authorJenkins <jenkins@review.openstack.org>
Sat, 12 Aug 2017 03:17:49 +0000 (03:17 +0000)
committerGerrit Code Review <review@openstack.org>
Sat, 12 Aug 2017 03:17:49 +0000 (03:17 +0000)

Trivial merge