Merge "standardize ssh auth"

diff --cc requirements.txt
index 0e6db69,22ce1d3..b22bce3
--- 1/requirements.txt
--- 2/requirements.txt
+++ b/requirements.txt
@@@ -7,9 -7,10 +7,10 @@@
  # http://www.apache.org/licenses/LICENSE-2.0
  ##############################################################################
  
 -appdirs==1.4.0
 +ansible==2.2.0.0
  Babel==2.3.4
  backport-ipaddress==0.1
+ chainmap==1.0.2
  cliff==2.3.0
  cmd2==0.6.8
  coverage==4.1b2

diff --cc yardstick/benchmark/scenarios/compute/cyclictest.py
Simple merge