Merge "voltctl: update ingress configuration after redeployment in berlin-lab"
diff --git a/jjb/pipeline/voltha/physical-build.groovy b/jjb/pipeline/voltha/physical-build.groovy
index 6ed3a8f..99871c5 100755
--- a/jjb/pipeline/voltha/physical-build.groovy
+++ b/jjb/pipeline/voltha/physical-build.groovy
@@ -122,8 +122,8 @@
installVoltctl("${branch}")
sh """
- sed -i -e "s/server: .*/server: voltha-${cluster}:443/" \
- -e "s/kvstore: .*/kvstore: voltha-infra-${cluster}:443/" \
+ sed -i -e "s/server: .*/server: voltha.${cluster}:443/" \
+ -e "s/kvstore: .*/kvstore: voltha-infra.${cluster}:443/" \
/home/jenkins/.volt/config
"""
@@ -183,6 +183,7 @@
bbsimReplica: bbsimReplicas.toInteger(),
withFttb: withFttb.toBoolean(),
adaptersToWait: numberOfAdaptersToWait,
+ cluster: cluster,
])
if(openoltAdapterChart != "onf/voltha-adapter-openolt"){
diff --git a/vars/volthaInfraDeploy.groovy b/vars/volthaInfraDeploy.groovy
index 8ec3008..773cbb0 100644
--- a/vars/volthaInfraDeploy.groovy
+++ b/vars/volthaInfraDeploy.groovy
@@ -96,6 +96,7 @@
// location of the kubernetes config file,
// if null we assume it's stored in the $KUBECONFIG
kubeconfig: null,
+ cluster: 'local'
]
Map cfg = defaultConfig + config
@@ -145,7 +146,8 @@
--set etcd.statefulset.replicaCount=${cfg.etcdReplica} \
--set etcd.replicaCount=${cfg.etcdReplica} \
--set etcd.ingress.enabled=true \
- --set etcd.ingress.enableVirtualHosts=true \
+ --set etcd.ingress.hosts[0].host=voltha-infra.${cfg.cluster} \
+ --set etcd.ingress.hosts[0].paths[0]='/etcdserverpb.KV/' \
-f $WORKSPACE/voltha-helm-charts/examples/${serviceConfigFile}-values.yaml ${cfg.extraHelmFlags}
""")
diff --git a/vars/volthaStackDeploy.groovy b/vars/volthaStackDeploy.groovy
index 5ccae56..22d63f6 100644
--- a/vars/volthaStackDeploy.groovy
+++ b/vars/volthaStackDeploy.groovy
@@ -59,7 +59,8 @@
--set global.voltha_infra_name=voltha-infra \
--set voltha.onos_classic.replicas=${cfg.onosReplica} \
--set voltha.ingress.enabled=true \
- --set voltha.ingress.enableVirtualHosts=true \
+ --set voltha.ingress.hosts[0].host=voltha.${cfg.cluster} \
+ --set voltha.ingress.hosts[0].paths[0]='/voltha.VolthaService/' \
--set global.voltha_infra_namespace=${cfg.infraNamespace} \
${cfg.extraHelmFlags}
""")
@@ -328,6 +329,7 @@
localCharts: false,
onosReplica: 1,
adaptersToWait: 2,
+ cluster: 'voltha.local',
]
Map cfg = defaultConfig + config