summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-06-07 05:26:25 -0700
committerGary Wu <gary.i.wu@huawei.com>2018-06-07 13:46:52 +0000
commit636905c68b3249345c017a891b1a6ad8b45cc1b2 (patch)
tree7272950fc7e180cc449546ad415421287c096792
parent77cb3c3602125e344677a0abdc134daca90dce05 (diff)
Change gerrit branches to beijing
Change-Id: I840e9aada77fa297273ef5b32663f70ca4aac371 Issue-ID: INT-506 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
-rwxr-xr-xresources/config/eteshare/config/vm_properties.py4
-rw-r--r--values.yaml2
2 files changed, 3 insertions, 3 deletions
diff --git a/resources/config/eteshare/config/vm_properties.py b/resources/config/eteshare/config/vm_properties.py
index 261d345..cfa789a 100755
--- a/resources/config/eteshare/config/vm_properties.py
+++ b/resources/config/eteshare/config/vm_properties.py
@@ -12,7 +12,7 @@ GLOBAL_INJECTED_DCAE_IP_ADDR = "dcae-healthcheck.{{include "common.namespace" .}
GLOBAL_INJECTED_DNS_IP_ADDR = "N/A"
GLOBAL_INJECTED_DOCKER_VERSION = "1.2-STAGING-latest"
GLOBAL_INJECTED_EXTERNAL_DNS = "N/A"
-GLOBAL_INJECTED_GERRIT_BRANCH = "master"
+GLOBAL_INJECTED_GERRIT_BRANCH = "beijing"
GLOBAL_INJECTED_LOG_ELASTICSEARCH_IP_ADDR = "log-es.{{include "common.namespace" .}}"
GLOBAL_INJECTED_LOG_KIBANA_IP_ADDR = "log-kibana.{{include "common.namespace" .}}"
GLOBAL_INJECTED_LOG_LOGSTASH_IP_ADDR = "log-ls-http.{{include "common.namespace" .}}"
@@ -67,7 +67,7 @@ GLOBAL_INJECTED_PROPERTIES = {
"GLOBAL_INJECTED_DNS_IP_ADDR" : "N/A",
"GLOBAL_INJECTED_DOCKER_VERSION" : "1.2-STAGING-latest",
"GLOBAL_INJECTED_EXTERNAL_DNS" : "N/A",
- "GLOBAL_INJECTED_GERRIT_BRANCH" : "master",
+ "GLOBAL_INJECTED_GERRIT_BRANCH" : "beijing",
"GLOBAL_INJECTED_KEYSTONE" : "{{ .Values.openStackKeyStoneUrl }}",
"GLOBAL_INJECTED_LOG_ELASTICSEARCH_IP_ADDR" : "log-es.{{include "common.namespace" .}}",
"GLOBAL_INJECTED_LOG_KIBANA_IP_ADDR" : "log-kibana.{{include "common.namespace" .}}",
diff --git a/values.yaml b/values.yaml
index cc81b9d..2d7df04 100644
--- a/values.yaml
+++ b/values.yaml
@@ -38,7 +38,7 @@ config:
# Password of the lighthttpd server. Used for HTML auth for webpage access
lightHttpdPassword: robot
# gerrit branch where the latest heat code is checked in
- gerritBranch: master
+ gerritBranch: beijing
# gerrit project where the latest heat code is checked in
gerritProject: http://gerrit.onap.org/r/demo.git