Merge "Map ctlplane network to management fqdn"
authorJenkins <jenkins@review.openstack.org>
Tue, 6 Sep 2016 13:42:49 +0000 (13:42 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 6 Sep 2016 13:42:49 +0000 (13:42 +0000)

Trivial merge