testnodes: Configure cpan and install Amazon::S3 on all OSes

Fixes: http://tracker.ceph.com/issues/15316
Signed-off-by: David Galloway <dgallowa@redhat.com>

diff --git a/roles/testnode/tasks/main.yml b/roles/testnode/tasks/main.yml
index d17c30f094fad6cbe58c13d1c1425778560d7248..e04368eb0080aa492aa66c00387706243300a75e 100644 (file)
--- a/roles/testnode/tasks/main.yml
+++ b/roles/testnode/tasks/main.yml
@@ -67,6 +67,11 @@
 - include: setup-debian.yml
   when: ansible_distribution == "Debian"
 
+# Install and configure cpan and Amazon::S3
+- include: cpan.yml
+  tags:
+    - cpan
+
 # upload custom disk monitoring scripts
 - include: disk_monitoring.yml
   tags:

diff --git a/roles/testnode/tasks/redhat/rhel_7.yml b/roles/testnode/tasks/redhat/rhel_7.yml
index 3572fc098a8911f5909b27e653cfe6d4f5fab63d..dcbe327f29a930248ca27294dff809f1dedbc467 100644 (file)
--- a/roles/testnode/tasks/redhat/rhel_7.yml
+++ b/roles/testnode/tasks/redhat/rhel_7.yml
@@ -7,8 +7,3 @@
   service:
     name: firewalld
     state: stopped
-
-# Install and configure cpan and Amazon::S3
-- include: ../cpan.yml
-  tags:
-    - cpan

diff --git a/roles/testnode/tasks/setup-ubuntu.yml b/roles/testnode/tasks/setup-ubuntu.yml
index d3599bf49057e2471d63ab6ecb25e49ed50265ca..f14df45b0bbc24f7b940645ba0943a37073ea751 100644 (file)
--- a/roles/testnode/tasks/setup-ubuntu.yml
+++ b/roles/testnode/tasks/setup-ubuntu.yml
@@ -4,11 +4,6 @@
     path: /etc/ceph
     state: absent
 
-# Install and configure cpan and Amazon::S3
-- include: cpan.yml
-  tags:
-    - cpan
-
 - include: nfs.yml
   tags:
     - nfs