qa/suites/rados/cephadm: fix conflicts, missing .qa link

Signed-off-by: Sage Weil <sage@redhat.com>

qa/suites/rados/cephadm/.qa

@@ -0,0 +1 @@
+../.qa

qa/suites/rados/cephadm/with-work/tasks/rados_api_tests.yaml

@@ -1 +1 @@
-../../basic/tasks/rados_api_tests.yaml
+../../../basic/tasks/rados_api_tests.yaml

qa/suites/rados/cephadm/with-work/tasks/rados_python.yaml

@@ -1 +1 @@
-../../basic/tasks/rados_python.yaml
+../../../basic/tasks/rados_python.yaml

qa/suites/rados/cephadm/workunits/distro/ubuntu_18.04_podman.yaml

@@ -0,0 +1,10 @@
+os_type: ubuntu
+os_version: "18.04"
+
+# feel free to remove this test, if ppa:projectatomic is no longer maintained.
+tasks:
+- exec:
+    all:
+    - sudo apt -y install software-properties-common
+    - sudo add-apt-repository -y ppa:projectatomic/ppa
+    - sudo apt -y install podman

qa/suites/rados/singleton-flat/.qa

@@ -1 +0,0 @@
-../.qa/