From d0d7cf6db7de84db90122079afcef933e813542c Mon Sep 17 00:00:00 2001 From: David Galloway Date: Mon, 27 Jun 2016 14:07:07 -0400 Subject: [PATCH] testnodes: Configure cpan and install Amazon::S3 on all OSes Fixes: http://tracker.ceph.com/issues/15316 Signed-off-by: David Galloway --- roles/testnode/tasks/main.yml | 5 +++++ roles/testnode/tasks/redhat/rhel_7.yml | 5 ----- roles/testnode/tasks/setup-ubuntu.yml | 5 ----- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/roles/testnode/tasks/main.yml b/roles/testnode/tasks/main.yml index d17c30f..e04368e 100644 --- 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 3572fc0..dcbe327 100644 --- 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 d3599bf..f14df45 100644 --- 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 -- 2.39.5