Fix cookied-bm-mcp-pike-k8s-contrail
Change-Id: Id788c4e33be273f18c5b5582494e9452501488b8
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 63f07b5..18032a1 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,56 +1,57 @@
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
- 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
+# 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
- 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
-
- 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
+# 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
@@ -79,71 +80,72 @@
ens3:
role: single_ctl
- 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
+# 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