Code Review / yardstick.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: a513db6 f49a1f2)
Merge "yardstick env influxdb/grafana cmd support centos"
authorRex Lee <limingjiang@huawei.com>
Tue, 25 Jul 2017 02:43:26 +0000 (02:43 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 25 Jul 2017 02:43:26 +0000 (02:43 +0000)
1  2 
yardstick/benchmark/core/task.py patch | diff1 | diff2 | blob | history
yardstick/common/constants.py patch | diff1 | diff2 | blob | history
yardstick/common/utils.py patch | diff1 | diff2 | blob | history

diff --cc yardstick/benchmark/core/task.py
Simple merge
diff --cc yardstick/common/constants.py
index 69485a4,e478c17..8e8114f
--- 1/yardstick/common/constants.py
--- 2/yardstick/common/constants.py
+++ b/yardstick/common/constants.py
@@@ -85,9 -75,9 +86,10 @@@ GRAFANA_USER = get_param('grafana.usern
  GRAFANA_PASS = get_param('grafana.password', 'admin')
  GRAFANA_IMAGE = get_param('grafana.image', 'grafana/grafana')
  GRAFANA_TAG = get_param('grafana.tag', '3.1.1')
+ GRAFANA_MAPPING_PORT = 1948
  
  # api
 +API_PORT = 5000
  DOCKER_URL = 'unix://var/run/docker.sock'
  INSTALLERS = ['apex', 'compass', 'fuel', 'joid']
  SQLITE = 'sqlite:////tmp/yardstick.db'
diff --cc yardstick/common/utils.py
Simple merge