From: Rex Lee <limingjiang@huawei.com>
Date: Tue, 25 Jul 2017 02:43:26 +0000 (+0000)
Subject: Merge "yardstick env influxdb/grafana cmd support centos"
X-Git-Tag: opnfv-5.0.RC1~344
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=d29df23ae5057fe0ccded6f8d8f3e36a084a78b3;p=yardstick.git

Merge "yardstick env influxdb/grafana cmd support centos"
---

d29df23ae5057fe0ccded6f8d8f3e36a084a78b3
diff --cc yardstick/common/constants.py
index 69485a4e4,e478c170e..8e8114fbb
--- a/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'