Merge "Use custom role names in deployed-server roles"
authorJenkins <jenkins@review.openstack.org>
Tue, 17 Jan 2017 15:47:19 +0000 (15:47 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 17 Jan 2017 15:47:19 +0000 (15:47 +0000)

Trivial merge