Merge "Move per role Services defaults into environment file"
authorJenkins <jenkins@review.openstack.org>
Mon, 7 Nov 2016 16:09:13 +0000 (16:09 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 7 Nov 2016 16:09:13 +0000 (16:09 +0000)

Trivial merge