Use reclass generator for k8s computes instead of 'static'
Change-Id: I779c954acb5f16f293bb6e930441b4e55b8c21d4
diff --git a/tcp_tests/templates/cookied-cicd-k8s-genie/cookiecutter-context-k8s-genie.yaml b/tcp_tests/templates/cookied-cicd-k8s-genie/cookiecutter-context-k8s-genie.yaml
index 55d1c5e..118322a 100644
--- a/tcp_tests/templates/cookied-cicd-k8s-genie/cookiecutter-context-k8s-genie.yaml
+++ b/tcp_tests/templates/cookied-cicd-k8s-genie/cookiecutter-context-k8s-genie.yaml
@@ -119,6 +119,11 @@
kubernetes_control_node03_address: 10.167.4.13
kubernetes_control_node03_deploy_address: 10.167.5.13
kubernetes_control_node03_hostname: ctl03
+ kubernetes_compute_count: 4
+ kubernetes_compute_rack01_hostname: cmp
+ kubernetes_compute_deploy_address_ranges: 10.167.5.101-10.167.5.104
+ kubernetes_compute_single_address_ranges: 10.167.4.101-10.167.4.104
+ kubernetes_compute_tenant_address_ranges: 10.167.6.101-10.167.6.104
kubernetes_enabled: 'True'
kubernetes_externaldns_enabled: 'False'
kubernetes_keepalived_vip_interface: br_ctl
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 8af2c0c..d9e20c6 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
@@ -109,8 +109,9 @@
ens4:
role: single_ctl_calico
- cmp001:
- reclass_storage_name: kubernetes_compute_node01
+ # Generator-based computes. For compatibility only
+ cmp<<count>>:
+ reclass_storage_name: kubernetes_compute_rack01
roles:
- kubernetes_compute
- linux_system_codename_xenial
@@ -120,43 +121,3 @@
role: single_dhcp
ens4:
role: single_ctl_calico
- single_address: ${_param:kubernetes_compute_node01_address}
-
- cmp002:
- reclass_storage_name: kubernetes_compute_node02
- roles:
- - kubernetes_compute
- - linux_system_codename_xenial
- - salt_master_host
- interfaces:
- ens3:
- role: single_dhcp
- ens4:
- role: single_ctl_calico
- single_address: ${_param:kubernetes_compute_node02_address}
-
- cmp003:
- reclass_storage_name: kubernetes_compute_node03
- roles:
- - kubernetes_compute
- - linux_system_codename_xenial
- - salt_master_host
- interfaces:
- ens3:
- role: single_dhcp
- ens4:
- role: single_ctl_calico
- single_address: ${_param:kubernetes_compute_node03_address}
-
- cmp004:
- reclass_storage_name: kubernetes_compute_node04
- roles:
- - kubernetes_compute
- - linux_system_codename_xenial
- - salt_master_host
- interfaces:
- ens3:
- role: single_dhcp
- ens4:
- role: single_ctl_calico
- single_address: ${_param:kubernetes_compute_node04_address}