Merge "Enable TLS in the internal network for keystone"
authorJenkins <jenkins@review.openstack.org>
Fri, 21 Oct 2016 12:05:31 +0000 (12:05 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 21 Oct 2016 12:05:31 +0000 (12:05 +0000)

Trivial merge