fix underlay. Fix steps
Change-Id: Ie6e65afca93d2f8cd0061aa97be5d61b7259f96d
diff --git a/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/salt-context-environment.yaml b/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/salt-context-environment.yaml
index 18032a1..47e12c8 100644
--- a/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/salt-context-environment.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/salt-context-environment.yaml
@@ -1,58 +1,4 @@
nodes:
- # Virtual Control Plane nodes
-# commented as ctl is bm
-# ctl01.cookied-bm-mcp-ocata-contrail.local:
-# reclass_storage_name: kubernetes_control_node01
-# roles:
-# - kubernetes_control_contrail
-# - linux_system_codename_xenial
-# interfaces:
-# ens3:
-# role: single_ctl
-#
-# ctl02.cookied-bm-mcp-ocata-contrail.local:
-# reclass_storage_name: kubernetes_control_node02
-# roles:
-# - kubernetes_control_contrail
-# - linux_system_codename_xenial
-# interfaces:
-# ens3:
-# role: single_ctl
-#
-# ctl03.cookied-bm-mcp-ocata-contrail.local:
-# reclass_storage_name: kubernetes_control_node03
-# roles:
-# - kubernetes_control_contrail
-# - linux_system_codename_xenial
-# interfaces:
-# ens3:
-# role: single_ctl
-
-# commented as there is no k8s proxy nodes in this setup
-# prx01.cookied-bm-mcp-ocata-contrail.local:
-# reclass_storage_name: kubernetes_proxy_node01
-# roles:
-# - kubernetes_proxy
-# # - infra_proxy
-# # - stacklight_proxy
-# - salt_master_host
-# - linux_system_codename_xenial
-# interfaces:
-# ens3:
-# role: single_ctl
-
-# prx02.cookied-bm-mcp-ocata-contrail.local:
-# reclass_storage_name: kubernetes_proxy_node02
-# roles:
-# - kubernetes_proxy
-# # - infra_proxy
-# # - stacklight_proxy
-# - salt_master_host
-# - linux_system_codename_xenial
-# interfaces:
-# ens3:
-# role: single_ctl
-
mon01.cookied-bm-mcp-ocata-contrail.local:
reclass_storage_name: stacklight_server_node01
roles:
@@ -80,73 +26,6 @@
ens3:
role: single_ctl
-# commented as shpuld be in pod
-# nal01.cookied-bm-mcp-ocata-contrail.local:
-# reclass_storage_name: opencontrail_analytics_node01
-# roles:
-# - opencontrail_analytics
-# - linux_system_codename_xenial
-# - salt_master_host
-# interfaces:
-# ens3:
-# role: single_ctl
-# single_address: 10.167.8.31
-#
-# nal02.cookied-bm-mcp-ocata-contrail.local:
-# reclass_storage_name: opencontrail_analytics_node02
-# roles:
-# - opencontrail_analytics
-# - linux_system_codename_xenial
-# - salt_master_host
-# interfaces:
-# ens3:
-# role: single_ctl
-# single_address: 10.167.8.32
-#
-# nal03.cookied-bm-mcp-ocata-contrail.local:
-# reclass_storage_name: opencontrail_analytics_node03
-# roles:
-# - opencontrail_analytics
-# - linux_system_codename_xenial
-# - salt_master_host
-# interfaces:
-# ens3:
-# role: single_ctl
-# single_address: 10.167.8.33
-#
-# ntw01.cookied-bm-mcp-ocata-contrail.local:
-# reclass_storage_name: opencontrail_control_node01
-# roles:
-# - opencontrail_control
-# - linux_system_codename_xenial
-# - salt_master_host
-# interfaces:
-# ens3:
-# role: single_ctl
-# single_address: 10.167.8.21
-#
-# ntw02.cookied-bm-mcp-ocata-contrail.local:
-# reclass_storage_name: opencontrail_control_node02
-# roles:
-# - opencontrail_control
-# - linux_system_codename_xenial
-# - salt_master_host
-# interfaces:
-# ens3:
-# role: single_ctl
-# single_address: 10.167.8.22
-#
-# ntw03.cookied-bm-mcp-ocata-contrail.local:
-# reclass_storage_name: opencontrail_control_node03
-# roles:
-# - opencontrail_control
-# - linux_system_codename_xenial
-# - salt_master_host
-# interfaces:
-# ens3:
-# role: single_ctl
-# single_address: 10.167.8.23
-
mtr01.cookied-bm-mcp-ocata-contrail.local:
reclass_storage_name: stacklight_telemetry_node01
roles:
@@ -201,11 +80,29 @@
ens3:
role: single_ctl
-# bmk01.cookied-bm-mcp-ocata-contrail.local:
-# reclass_storage_name: openstack_benchmark_node01
-# roles:
-# - openstack_benchmark
-# - linux_system_codename_xenial
-# interfaces:
-# ens3:
-# role: single_ctl
+ cid01.cookied-bm-mcp-ocata-contrail.local:
+ reclass_storage_name: cicd_control_node01
+ roles:
+ - cicd_control_leader
+ - linux_system_codename_xenial
+ interfaces:
+ ens3:
+ role: single_ctl
+
+ cid02.cookied-bm-mcp-ocata-contrail.local:
+ reclass_storage_name: cicd_control_node02
+ roles:
+ - cicd_control_manager
+ - linux_system_codename_xenial
+ interfaces:
+ ens3:
+ role: single_ctl
+
+ cid03.cookied-bm-mcp-ocata-contrail.local:
+ reclass_storage_name: cicd_control_node03
+ roles:
+ - cicd_control_manager
+ - linux_system_codename_xenial
+ interfaces:
+ ens3:
+ role: single_ctl