Merge "Fix ceilometer issue"
authorJustin chi <chigang@huawei.com>
Wed, 18 Oct 2017 13:55:40 +0000 (13:55 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Wed, 18 Oct 2017 13:55:40 +0000 (13:55 +0000)

Trivial merge