Merge "skip ha and rename tempest.conf"
authorhongbo tian <hongbo.tianhongbo@huawei.com>
Mon, 24 Apr 2017 10:01:08 +0000 (10:01 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Mon, 24 Apr 2017 10:01:08 +0000 (10:01 +0000)

Trivial merge