Merge "Modifying Cisco templates to support composable roles"
authorJenkins <jenkins@review.openstack.org>
Tue, 25 Jul 2017 05:56:33 +0000 (05:56 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 25 Jul 2017 05:56:33 +0000 (05:56 +0000)

Trivial merge