Merge "Get configurations from pharos instead securedlab"
authorZhijiang Hu <hu.zhijiang@zte.com.cn>
Fri, 5 Jan 2018 06:28:53 +0000 (06:28 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Fri, 5 Jan 2018 06:28:53 +0000 (06:28 +0000)

Trivial merge