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-cicd-k8s-genie/environment-context-k8s-genie.yaml b/tcp_tests/templates/cookied-cicd-k8s-genie/environment-context-k8s-genie.yaml
index d13627b..807d07f 100644
--- a/tcp_tests/templates/cookied-cicd-k8s-genie/environment-context-k8s-genie.yaml
+++ b/tcp_tests/templates/cookied-cicd-k8s-genie/environment-context-k8s-genie.yaml
@@ -9,6 +9,8 @@
role: single_dhcp
ens4:
role: single_static_ctl
+ ens5:
+ role: single_storage_dhcp
kvm01:
reclass_storage_name: infra_kvm_node01
@@ -86,6 +88,8 @@
role: single_dhcp
ens4:
role: single_ctl_calico
+ ens5:
+ role: single_storage_dhcp
ctl02:
reclass_storage_name: kubernetes_control_node02
@@ -97,6 +101,8 @@
role: single_dhcp
ens4:
role: single_ctl_calico
+ ens5:
+ role: single_storage_dhcp
ctl03:
reclass_storage_name: kubernetes_control_node03
@@ -108,6 +114,8 @@
role: single_dhcp
ens4:
role: single_ctl_calico
+ ens5:
+ role: single_storage_dhcp
prx01:
reclass_storage_name: kubernetes_proxy_node01
@@ -119,6 +127,8 @@
role: single_dhcp
ens4:
role: single_ctl
+ ens5:
+ role: single_storage_dhcp
prx02:
reclass_storage_name: kubernetes_proxy_node02
@@ -130,6 +140,8 @@
role: single_dhcp
ens4:
role: single_ctl
+ ens5:
+ role: single_storage_dhcp
# Generator-based computes. For compatibility only
cmp<<count>>:
@@ -143,3 +155,5 @@
role: single_dhcp
ens4:
role: single_ctl_calico
+ ens5:
+ role: single_storage_dhcp