commit b3b3749d7378b10e6bd124431b96d2f40896c098
author Dennis Dmitriev <ddmitriev@mirantis.com> Sun Jul 08 21:23:00 2018 +0300
committer Dennis Dmitriev <ddmitriev@mirantis.com> Wed Jul 18 16:36:23 2018 +0300
tree 52455b266f3028985d30cd1185aaf7bab4cbe11b
parent 67f5e8b0d64441e0d5b30489c0f5a0ec8c536358

Add cookied-cicd models for openstack configs: ovs/dvr/dpdk

Change-Id: If9e72928b90bb13fd51199c93f9255ec52576bc4

tcp_tests/templates/cookied-cicd-k8s-calico-sl/environment-context-k8s-sl.yaml

diff --git a/tcp_tests/templates/cookied-cicd-k8s-calico-sl/environment-context-k8s-sl.yaml b/tcp_tests/templates/cookied-cicd-k8s-calico-sl/environment-context-k8s-sl.yaml
index 248b42d..2b89364 100644
--- a/tcp_tests/templates/cookied-cicd-k8s-calico-sl/environment-context-k8s-sl.yaml
+++ b/tcp_tests/templates/cookied-cicd-k8s-calico-sl/environment-context-k8s-sl.yaml
@@ -109,8 +109,9 @@
         ens4:
           role: single_ctl
 
-    cmp01:
-      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,20 +121,6 @@
           role: single_dhcp
         ens4:
           role: single_ctl
-          single_address: ${_param:kubernetes_compute_node01_address}
-
-    cmp02:
-      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
-          single_address: ${_param:kubernetes_compute_node02_address}
 
     mon01:
       reclass_storage_name: stacklight_server_node01