Merge "Bugfix:proxy env, ansible multinode support"
authorRoss Brattain <ross.b.brattain@intel.com>
Fri, 22 Dec 2017 10:52:13 +0000 (10:52 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Fri, 22 Dec 2017 10:52:13 +0000 (10:52 +0000)

Trivial merge