Merge "Fix ceilometer auth url for compute"
authorJenkins <jenkins@review.openstack.org>
Wed, 20 Jul 2016 20:26:18 +0000 (20:26 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 20 Jul 2016 20:26:18 +0000 (20:26 +0000)

Trivial merge