Merge "Add role specific information to the service template"
authorJenkins <jenkins@review.openstack.org>
Mon, 15 May 2017 11:28:51 +0000 (11:28 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 15 May 2017 11:28:51 +0000 (11:28 +0000)

Trivial merge