Add k8s ingress and metallb features
- enable ingress-nginx and metallb features
for the configurations:
- cookiecutter-context-k8s-sl
- cookied-cicd-k8s-genie
- cookied-bm-k8s-contrail
- add 'external' network on cfg, ctl, cmp and prx nodes
- enable DHCP in 'external' network for auto configuration
of the external interfaces
- get the status of the ingress and metallb features from
the salt pillar instead of environment variables to
run the tests on the existing deployments
Related-Task: PROD-22687
Closes-Bug: PROD-24580
Change-Id: Ifee60814718abc604008af5e2058a6db1bf92d6d
diff --git a/tcp_tests/templates/cookied-bm-k8s-contrail/salt-context-cookiecutter-k8s-contrail.yaml b/tcp_tests/templates/cookied-bm-k8s-contrail/salt-context-cookiecutter-k8s-contrail.yaml
index 570000a..9e62bbf 100644
--- a/tcp_tests/templates/cookied-bm-k8s-contrail/salt-context-cookiecutter-k8s-contrail.yaml
+++ b/tcp_tests/templates/cookied-bm-k8s-contrail/salt-context-cookiecutter-k8s-contrail.yaml
@@ -111,6 +111,10 @@
kubernetes_compute_single_address_ranges: 10.167.8.103-10.167.8.104
kubernetes_compute_tenant_address_ranges: 10.167.8.103-10.167.8.104
kubernetes_network_opencontrail_enabled: 'True'
+ kubernetes_metallb_enabled: 'False' # Not used with opencontrail
+ metallb_addresses: 172.17.41.160-172.17.41.180
+ kubernetes_ingressnginx_enabled: 'True'
+ kubernetes_ingressnginx_controller_replicas: 2
local_repositories: 'False'
maas_deploy_address: 172.16.49.66
maas_deploy_range_end: 10.0.0.254