Merge "Add custom roles data for deployed-server"
authorJenkins <jenkins@review.openstack.org>
Fri, 6 Jan 2017 18:19:05 +0000 (18:19 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 6 Jan 2017 18:19:05 +0000 (18:19 +0000)

Trivial merge