Remove MDB nodes (openstack.telemetry role)
Services from mdb nodes were moved on ctl nodes:
https://github.com/Mirantis/mk2x-cookiecutter-reclass-model/blob/master/releasenotes/notes/remove-mdb-nodes-56de3bfdf2327eba.yaml
Change-Id: Ie6dc067cb24e23ac598b9f079a4c0d1a0345a6b6
diff --git a/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/salt-context-cookiecutter-contrail.yaml
index da3e22a..4eecd23 100644
--- a/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/salt-context-cookiecutter-contrail.yaml
@@ -110,14 +110,6 @@
openstack_proxy_node01_hostname: prx01
openstack_proxy_node02_address: 10.167.4.82
openstack_proxy_node02_hostname: prx02
- openstack_telemetry_address: 10.167.4.75
- openstack_telemetry_hostname: mdb
- openstack_telemetry_node01_address: 10.167.4.76
- openstack_telemetry_node01_hostname: mdb01
- openstack_telemetry_node02_address: 10.167.4.77
- openstack_telemetry_node02_hostname: mdb02
- openstack_telemetry_node03_address: 10.167.4.78
- openstack_telemetry_node03_hostname: mdb03
openstack_version: ocata
oss_enabled: 'False'
oss_notification_app_id: '24'
diff --git a/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/salt-context-environment.yaml b/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/salt-context-environment.yaml
index d9a2193..53417f2 100644
--- a/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/salt-context-environment.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/salt-context-environment.yaml
@@ -82,33 +82,6 @@
ens3:
role: single_ctl
- mdb01.cookied-bm-mcp-ocata-contrail.local:
- reclass_storage_name: openstack_telemetry_node01
- roles:
- - openstack_telemetry
- - linux_system_codename_xenial
- interfaces:
- ens3:
- role: single_ctl
-
- mdb02.cookied-bm-mcp-ocata-contrail.local:
- reclass_storage_name: openstack_telemetry_node02
- roles:
- - openstack_telemetry
- - linux_system_codename_xenial
- interfaces:
- ens3:
- role: single_ctl
-
- mdb03.cookied-bm-mcp-ocata-contrail.local:
- reclass_storage_name: openstack_telemetry_node03
- roles:
- - openstack_telemetry
- - linux_system_codename_xenial
- interfaces:
- ens3:
- role: single_ctl
-
prx01.cookied-bm-mcp-ocata-contrail.local:
reclass_storage_name: openstack_proxy_node01
roles:
diff --git a/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/salt-context-cookiecutter-cicd_oss.yaml b/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/salt-context-cookiecutter-cicd_oss.yaml
index 73b474f..3368698 100644
--- a/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/salt-context-cookiecutter-cicd_oss.yaml
+++ b/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/salt-context-cookiecutter-cicd_oss.yaml
@@ -121,14 +121,6 @@
openstack_proxy_node01_hostname: prx01
openstack_proxy_node02_address: 10.167.4.82
openstack_proxy_node02_hostname: prx02
- openstack_telemetry_address: ${_param:openstack_control_address}
- openstack_telemetry_hostname: ${_param:openstack_control_hostname}
- openstack_telemetry_node01_address: ${_param:openstack_control_node01_address}
- openstack_telemetry_node01_hostname: ${_param:openstack_control_node01_hostname}
- openstack_telemetry_node02_address: ${_param:openstack_control_node02_address}
- openstack_telemetry_node02_hostname: ${_param:openstack_control_node02_hostname}
- openstack_telemetry_node03_address: ${_param:openstack_control_node03_address}
- openstack_telemetry_node03_hostname: ${_param:openstack_control_node03_hostname}
openstack_benchmark_node01_hostname: bmk01
openstack_benchmark_node01_address: 10.167.4.85
openstack_version: ocata
diff --git a/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/salt-context-environment.yaml b/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/salt-context-environment.yaml
index 16f4fb1..648984a 100644
--- a/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/salt-context-environment.yaml
+++ b/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/salt-context-environment.yaml
@@ -52,7 +52,6 @@
- openstack_control_leader
- openstack_database_leader
- openstack_message_queue
- - openstack_telemetry
- features_designate_database
- features_designate
- features_designate_keystone
@@ -69,7 +68,6 @@
- openstack_control
- openstack_database
- openstack_message_queue
- - openstack_telemetry
- features_designate_database
- features_designate
- linux_system_codename_xenial
@@ -85,7 +83,6 @@
- openstack_control
- openstack_database
- openstack_message_queue
- - openstack_telemetry
- features_designate_database
- features_designate
- linux_system_codename_xenial
diff --git a/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/salt.yaml b/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/salt.yaml
index bda6d51..313982a 100644
--- a/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/salt.yaml
+++ b/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/salt.yaml
@@ -31,7 +31,6 @@
sed -i '/system.reclass.storage.system.physical_control_cluster/d' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/config.yml;
sed -i '/system.reclass.storage.system.openstack_database_cluster/d' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/config.yml;
sed -i '/system.reclass.storage.system.openstack_message_queue_cluster/d' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/config.yml;
- sed -i '/system.reclass.storage.system.openstack_telemetry_cluster/d' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/config.yml;
sed -i '/system.reclass.storage.system.stacklight_telemetry_cluster/d' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/config.yml;
sed -i '/system.reclass.storage.system.stacklight_log_cluster/d' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/config.yml;
@@ -44,9 +43,6 @@
reclass-tools del-key parameters.reclass.storage.node.openstack_message_queue_node01 /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/config.yml;
reclass-tools del-key parameters.reclass.storage.node.openstack_message_queue_node02 /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/config.yml;
reclass-tools del-key parameters.reclass.storage.node.openstack_message_queue_node03 /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/config.yml;
- reclass-tools del-key parameters.reclass.storage.node.openstack_telemetry_node01 /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/config.yml;
- reclass-tools del-key parameters.reclass.storage.node.openstack_telemetry_node02 /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/config.yml;
- reclass-tools del-key parameters.reclass.storage.node.openstack_telemetry_node03 /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/config.yml;
reclass-tools del-key parameters.reclass.storage.node.stacklight_log_node01 /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/config.yml;
node_name: {{ HOSTNAME_CFG01 }}
retry: {count: 1, delay: 5}
diff --git a/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/salt-context-cookiecutter-openstack_ovs_dvr_vxlan.yaml b/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/salt-context-cookiecutter-openstack_ovs_dvr_vxlan.yaml
index 4f0f646..46deafe 100644
--- a/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/salt-context-cookiecutter-openstack_ovs_dvr_vxlan.yaml
+++ b/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/salt-context-cookiecutter-openstack_ovs_dvr_vxlan.yaml
@@ -95,14 +95,6 @@
openstack_proxy_node01_hostname: prx01
openstack_proxy_node02_address: 10.167.4.82
openstack_proxy_node02_hostname: prx02
- openstack_telemetry_address: 10.167.4.75
- openstack_telemetry_hostname: mdb
- openstack_telemetry_node01_address: 10.167.4.76
- openstack_telemetry_node01_hostname: mdb01
- openstack_telemetry_node02_address: 10.167.4.77
- openstack_telemetry_node02_hostname: mdb02
- openstack_telemetry_node03_address: 10.167.4.78
- openstack_telemetry_node03_hostname: mdb03
openstack_benchmark_node01_hostname: bmk01
openstack_benchmark_node01_address: 10.167.4.85
openstack_version: ocata
diff --git a/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/salt-context-environment.yaml b/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/salt-context-environment.yaml
index 332473c..9de891d 100644
--- a/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/salt-context-environment.yaml
+++ b/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/salt-context-environment.yaml
@@ -182,39 +182,6 @@
ens4:
role: single_vlan_ctl
- mdb01.mcp-ocata-dvr-vxlan.local:
- reclass_storage_name: openstack_telemetry_node01
- roles:
- - openstack_telemetry
- - linux_system_codename_xenial
- interfaces:
- ens3:
- role: single_dhcp
- ens4:
- role: single_vlan_ctl
-
- mdb02.mcp-ocata-dvr-vxlan.local:
- reclass_storage_name: openstack_telemetry_node02
- roles:
- - openstack_telemetry
- - linux_system_codename_xenial
- interfaces:
- ens3:
- role: single_dhcp
- ens4:
- role: single_vlan_ctl
-
- mdb03.mcp-ocata-dvr-vxlan.local:
- reclass_storage_name: openstack_telemetry_node03
- roles:
- - openstack_telemetry
- - linux_system_codename_xenial
- interfaces:
- ens3:
- role: single_dhcp
- ens4:
- role: single_vlan_ctl
-
prx01.mcp-ocata-dvr-vxlan.local:
reclass_storage_name: openstack_proxy_node01
roles:
diff --git a/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/underlay.yaml b/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/underlay.yaml
index a5bf838..59fcc0d 100644
--- a/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/underlay.yaml
+++ b/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/underlay.yaml
@@ -93,10 +93,6 @@
default_{{ HOSTNAME_PRX }}: +80
default_{{ HOSTNAME_PRX01 }}: +81
default_{{ HOSTNAME_PRX02 }}: +82
- default_{{ HOSTNAME_MDB }}: +75
- default_{{ HOSTNAME_MDB01 }}: +76
- default_{{ HOSTNAME_MDB02 }}: +77
- default_{{ HOSTNAME_MDB03 }}: +78
default_{{ HOSTNAME_BMK01 }}: +85
default_{{ HOSTNAME_MON }}: +70
@@ -153,10 +149,6 @@
default_{{ HOSTNAME_PRX }}: +80
default_{{ HOSTNAME_PRX01 }}: +81
default_{{ HOSTNAME_PRX02 }}: +82
- default_{{ HOSTNAME_MDB }}: +75
- default_{{ HOSTNAME_MDB01 }}: +76
- default_{{ HOSTNAME_MDB02 }}: +77
- default_{{ HOSTNAME_MDB03 }}: +78
default_{{ HOSTNAME_BMK01 }}: +85
default_{{ HOSTNAME_MON }}: +70
@@ -214,10 +206,6 @@
default_{{ HOSTNAME_PRX }}: +80
default_{{ HOSTNAME_PRX01 }}: +81
default_{{ HOSTNAME_PRX02 }}: +82
- default_{{ HOSTNAME_MDB }}: +75
- default_{{ HOSTNAME_MDB01 }}: +76
- default_{{ HOSTNAME_MDB02 }}: +77
- default_{{ HOSTNAME_MDB03 }}: +78
default_{{ HOSTNAME_BMK01 }}: +85
default_{{ HOSTNAME_MON }}: +70
@@ -274,10 +262,6 @@
default_{{ HOSTNAME_PRX }}: +80
default_{{ HOSTNAME_PRX01 }}: +81
default_{{ HOSTNAME_PRX02 }}: +82
- default_{{ HOSTNAME_MDB }}: +75
- default_{{ HOSTNAME_MDB01 }}: +76
- default_{{ HOSTNAME_MDB02 }}: +77
- default_{{ HOSTNAME_MDB03 }}: +78
default_{{ HOSTNAME_BMK01 }}: +85
default_{{ HOSTNAME_MON }}: +70