Add tempest run with ceph config
Change-Id: I068a55b44ef9c056192b9cc741e079087ca34da8
diff --git a/tcp_tests/templates/virtual-mcp-ocata-ovs-ceph/ceph.yaml b/tcp_tests/templates/virtual-mcp-ocata-ovs-ceph/ceph.yaml
index aeb8712..17450c6 100644
--- a/tcp_tests/templates/virtual-mcp-ocata-ovs-ceph/ceph.yaml
+++ b/tcp_tests/templates/virtual-mcp-ocata-ovs-ceph/ceph.yaml
@@ -140,6 +140,13 @@
retry: {count: 2, delay: 5}
skip_fail: false
+- description: Restart nova-compute
+ cmd: |
+ salt -C 'I@nova:compute' service.restart nova-compute;
+ node_name: {{ HOSTNAME_CFG01 }}
+ retry: {count: 2, delay: 5}
+ skip_fail: false
+
- description: conver cirros image
cmd: salt --hard-crash --state-output=mixed --state-verbose=False 'ctl01*' cmd.run
'qemu-img convert cirros-0.3.4-i386-disk.img cirros.raw'
diff --git a/tcp_tests/tests/system/test_ovs_ocata_ceph.py b/tcp_tests/tests/system/test_ovs_ocata_ceph.py
index 5f5df02..307c9ed 100644
--- a/tcp_tests/tests/system/test_ovs_ocata_ceph.py
+++ b/tcp_tests/tests/system/test_ovs_ocata_ceph.py
@@ -34,7 +34,7 @@
1. Prepare salt on hosts
2. Setup controller nodes
3. Setup compute nodes
- 4. Setup ceph
+ 4. Setup ceph RBD, replication factor 2 for cinder, nova, glance
5. Run tempest
"""
@@ -43,6 +43,7 @@
args='service ntp stop; ntpd -gq; service ntp start')
if settings.RUN_TEMPEST:
- openstack_actions.run_tempest(pattern=settings.PATTERN)
+ openstack_actions.run_tempest(pattern=settings.PATTERN,
+ conf_name='ceph_mcp.conf')
openstack_actions.download_tempest_report()
LOG.info("*************** DONE **************")