added yaml to run tests from qa and modifed 4.node.yaml to new config

diff --git a/qa/suites/rgw/nfs-ganesha/clusters/4-node.yaml b/qa/suites/rgw/nfs-ganesha/clusters/4-node.yaml
index f13e538198cb258e1d4ef134b63f22574ab85559..91b641905c2587a03f307f7d17a99caf17ed7c5a 100644 (file)
--- a/qa/suites/rgw/nfs-ganesha/clusters/4-node.yaml
+++ b/qa/suites/rgw/nfs-ganesha/clusters/4-node.yaml
@@ -1,20 +1,19 @@
 overrides:
-  ceph-ansible:
-    group_vars:
-      all:
-        ceph_conf_overrides:
-          global:
-            osd_default_pool_size: 3
-            osd_pool_default_pg_num: 128
-            osd_pool_default_pgp_num: 128
+  ceph_ansible:
     vars:
-        osd_auto_discovery: false
-        ceph_test: True
-        ceph_origin: distro
-        journal_collocation: True
-        journal_size: 1024
-        ceph_stable: True
-        ceph_stable_rh_storage: True
+      osd_auto_discovery: false
+      ceph_test: True
+      ceph_origin: distro
+      journal_collocation: True
+      journal_size: 1024
+      ceph_stable: True
+      ceph_stable_rh_storage: True
+      ceph_conf_overrides:
+        global:
+          osd_default_pool_size: 3
+          osd_pool_default_pg_num: 128
+          osd_pool_default_pgp_num: 128
+          osd crush chooseleaf type: 0
 roles:
 - - mon.a
   - osd.0

diff --git a/qa/suites/rgw/nfs-ganesha/tasks/nfs_ganesha_rgw_install.yaml b/qa/suites/rgw/nfs-ganesha/tasks/nfs_ganesha_rgw_install.yaml
deleted file mode 100644 (file)
index 91c724a..0000000
--- a/qa/suites/rgw/nfs-ganesha/tasks/nfs_ganesha_rgw_install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- ssh-keys: null
-- ceph-ansible: null
-- nfs_ganesha_rgw:
\ No newline at end of file

diff --git a/qa/suites/rgw/nfs-ganesha/tasks/test_basic_io.yaml b/qa/suites/rgw/nfs-ganesha/tasks/test_basic_io.yaml
new file mode 100644 (file)
index 0000000..e3bbc55
--- /dev/null
+++ b/qa/suites/rgw/nfs-ganesha/tasks/test_basic_io.yaml
@@ -0,0 +1,5 @@
+tasks:
+- ssh-keys: null
+- ceph-ansible: null
+- nfs_ganesha_rgw:
+    test-name: test_basic_io
\ No newline at end of file

diff --git a/qa/suites/rgw/nfs-ganesha/tasks/test_basic_io_from_s3.yaml b/qa/suites/rgw/nfs-ganesha/tasks/test_basic_io_from_s3.yaml
new file mode 100644 (file)
index 0000000..77a3a00
--- /dev/null
+++ b/qa/suites/rgw/nfs-ganesha/tasks/test_basic_io_from_s3.yaml
@@ -0,0 +1,5 @@
+tasks:
+- ssh-keys: null
+- ceph-ansible: null
+- nfs_ganesha_rgw:
+    test-name: test_basic_io_from_s3
\ No newline at end of file

diff --git a/qa/suites/rgw/nfs-ganesha/tasks/test_delete_file_nfs.yaml b/qa/suites/rgw/nfs-ganesha/tasks/test_delete_file_nfs.yaml
new file mode 100644 (file)
index 0000000..31c0675
--- /dev/null
+++ b/qa/suites/rgw/nfs-ganesha/tasks/test_delete_file_nfs.yaml
@@ -0,0 +1,5 @@
+tasks:
+- ssh-keys: null
+- ceph-ansible: null
+- nfs_ganesha_rgw:
+    test-name: test_delete_file_nfs
\ No newline at end of file

diff --git a/qa/suites/rgw/nfs-ganesha/tasks/test_delete_file_s3.yaml b/qa/suites/rgw/nfs-ganesha/tasks/test_delete_file_s3.yaml
new file mode 100644 (file)
index 0000000..5cc69db
--- /dev/null
+++ b/qa/suites/rgw/nfs-ganesha/tasks/test_delete_file_s3.yaml
@@ -0,0 +1,5 @@
+tasks:
+- ssh-keys: null
+- ceph-ansible: null
+- nfs_ganesha_rgw:
+    test-name: test_delete_file_s3
\ No newline at end of file

diff --git a/qa/suites/rgw/nfs-ganesha/tasks/test_move_file_nfs.yaml b/qa/suites/rgw/nfs-ganesha/tasks/test_move_file_nfs.yaml
new file mode 100644 (file)
index 0000000..b96ddff
--- /dev/null
+++ b/qa/suites/rgw/nfs-ganesha/tasks/test_move_file_nfs.yaml
@@ -0,0 +1,5 @@
+tasks:
+- ssh-keys: null
+- ceph-ansible: null
+- nfs_ganesha_rgw:
+    test-name: test_move_file_nfs
\ No newline at end of file

diff --git a/qa/suites/rgw/nfs-ganesha/tasks/test_move_file_s3.yaml b/qa/suites/rgw/nfs-ganesha/tasks/test_move_file_s3.yaml
new file mode 100644 (file)
index 0000000..fdfd95b
--- /dev/null
+++ b/qa/suites/rgw/nfs-ganesha/tasks/test_move_file_s3.yaml
@@ -0,0 +1,5 @@
+tasks:
+- ssh-keys: null
+- ceph-ansible: null
+- nfs_ganesha_rgw:
+    test-name: test_move_file_s3
\ No newline at end of file