voltctl: update ingress configuration after redeployment in berlin-lab
* handover cluster variable for helm deployments of voltha-infra and
voltha-stack (volthaInfraDeploy.groovy and volthaStackDeploy.groovy
are called from vars/volthaDeploy.groovy) to allow usage of it in
'helm upgrade --install' commands
* replace default virtualhost ingress (enableVirtualHosts=true) for
voltha-infra and voltha-stack with specific ingress host, by using
cluster variable (paths also needs to be defined, since there is not
default for it when defining a specific host)
* adapt volt config generation for physical-build jobs to use '.'
instead of '-' when adding the value of the cluster variable to align
with settings for bbsim voltctl configuration
* set default value 'local' for cluster variable when using it in
volthaInfraDeploy.groovy context (to set voltha-infra.local as default
ingress hostname)
* set default value 'voltha.local' for cluster variable when using it in
volthaStackDeploy.groovy context (to set voltha.voltha.local as
default ingress hostname)
Change-Id: I06ff30b1dafd054232f6f1d62fb0798a92a747a8
Signed-off-by: Jan Klare <jan.klare@bisdn.de>
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