Review tests
Add restart salt-minion in add_ceph_node tests
Return the Ceph health check back in ceph_failover tests
Wait for healthy CEPH after each node restart in ceph_failover tests
Change cvp-sanity and tempest parameters for ceph_failover tests
Add JJB template for Ceph Failover tests
Fix parameters to start SaltMaster backup/restore tests
PROD-36643
Change-Id: I52017158d07373d7cb90846e42edb4276e385552
diff --git a/tcp_tests/tests/system/test_ceph_operations.py b/tcp_tests/tests/system/test_ceph_operations.py
index b2f98b0..55791ca 100644
--- a/tcp_tests/tests/system/test_ceph_operations.py
+++ b/tcp_tests/tests/system/test_ceph_operations.py
@@ -1,3 +1,5 @@
+import time
+
import pytest
from tcp_tests import logger
@@ -27,10 +29,11 @@
node_name=cfg_node,
raise_on_err=False)
# Need to restart salt-minion service after accepting it in Salt Master
- # underlay_actions.check_call(
- # "systemctl restart salt-minion",
- # node_name=xtra_node,
- # raise_on_err=False)
+ underlay_actions.check_call(
+ "systemctl restart salt-minion",
+ node_name=xtra_node,
+ raise_on_err=False)
+ time.sleep(15)
# salt_actions.enforce_state("xtra*", "linux")
# salt_actions.enforce_state("xtra*", "openssh")
@@ -469,6 +472,7 @@
#OSDSETTINGS
#MONSETTINGS
#RGWSETTINGS
+ #MGRSETTINGS
linux_network_interfaces:
br_ctl:
address: ${_param:ceph_#NODE_node04_address}
@@ -499,6 +503,7 @@
'OSDSETTINGS': '',
'MONSETTINGS': '',
'RGWSETTINGS': '',
+ 'MGRSETTINGS': '',
}
# # ------------------OSD specific settings ----------
@@ -521,6 +526,10 @@
keepalived_vip_priority: 104
""" # noqa: E501
+ # # ------------------MGR specific settings -----------
+ if node == 'mgr':
+ data['MGRSETTINGS'] = ""
+
yaml_config = template.substitute(data)
return yaml_config