Revert "WA for changing class sequence for RGW node"
This reverts commit 29a323b41a4d22f3cfd2fb6afb6b31e6eb24277b.
Reason for revert: ${_param:cluster_name} - not determined
Change-Id: I24ad75ce6aa3aeafd1ef4b919639cde1c4df41d8
diff --git a/tcp_tests/tests/system/test_mcp_update.py b/tcp_tests/tests/system/test_mcp_update.py
index b21b124..45e3cdd 100644
--- a/tcp_tests/tests/system/test_mcp_update.py
+++ b/tcp_tests/tests/system/test_mcp_update.py
@@ -125,32 +125,9 @@
@pytest.fixture
-def wa_for_import_ceph_classes_after_infra_prod36461(reclass_actions,
- salt_actions):
- if salt_actions.cmd_run("rgw*", "test.ping")[0].keys():
- # ####### WA for Ceph RGW* classes PROD-36461 ###
- LOG.info("Changing class sequence for RGW PROD-36461")
- reclass_actions.delete_class(
- "cluster.${_param:cluster_name}.ceph",
- "cluster/*/ceph/rgw.yml")
- reclass_actions.delete_class(
- "cluster.${_param:cluster_name}.ceph.common",
- "cluster/*/ceph/rgw.yml")
- reclass_actions.add_class(
- "cluster.${_param:cluster_name}.ceph",
- "cluster/*/ceph/rgw.yml")
- reclass_actions.add_class(
- "cluster.${_param:cluster_name}.ceph.common",
- "cluster/*/ceph/rgw.yml")
- reclass_actions.commit(
- "[from TCP-QA] Changing class sequence for RGW")
- else:
- LOG.info("Skip WA for RGW PROD-36461")
-
-
-@pytest.fixture
def wa_for_alerta_password_prod35958(reclass_actions,
salt_actions):
+
if not salt_actions.get_pillar("I@prometheus:alerta",
"_param:alerta_admin_api_key_generated")[0]:
reclass_actions.add_key(
@@ -192,8 +169,7 @@
@pytest.mark.usefixtures("switch_to_proposed_pipelines",
"wa_for_galera_clustercheck_password_prod35705",
- "wa_for_alerta_password_prod35958",
- "wa_for_import_ceph_classes_after_infra_prod36461")
+ "wa_for_alerta_password_prod35958")
class TestUpdateMcpCluster(object):
"""
Following the steps in