Merge pull request #588 from ceph/centos-deps

Define CentOS vs RHEL dependencies

roles/ceph-common/defaults/main.yml

@@ -35,7 +35,7 @@ debian_package_dependencies:
   - hdparm
   - ntp
 
-redhat_package_dependencies:
+centos_package_dependencies:
   - python-pycurl
   - hdparm
   - yum-plugin-priorities.noarch
@@ -43,6 +43,12 @@ redhat_package_dependencies:
   - ntp
   - python-setuptools
 
+redhat_package_dependencies:
+  - python-pycurl
+  - hdparm
+  - ntp
+  - python-setuptools
+
 # Whether or not to install the ceph-test package.
 ceph_test: False
 

roles/ceph-common/tasks/installs/install_on_redhat.yml

@@ -4,14 +4,27 @@
     name: "{{ item }}"
     state: present
   with_items: redhat_package_dependencies
-  when: ansible_pkg_mgr == "yum"
+  when:
+    ansible_distribution == "RedHat" and
+    ansible_pkg_mgr == "yum"
+
+- name: install dependencies
+  yum:
+    name: "{{ item }}"
+    state: present
+  with_items: centos_package_dependencies
+  when:
+    ansible_distribution == "CentOS" and
+    ansible_pkg_mgr == "yum"
 
 - name: install dependencies
   dnf:
     name: "{{ item }}"
     state: present
-  with_items: redhat_package_dependencies
-  when: ansible_pkg_mgr == "dnf"
+  with_items: centos_package_dependencies
+  when:
+    ansible_distribution == "CentOS" and
+    ansible_pkg_mgr == "dnf"
 
 - name: configure ceph yum repository
   include: redhat_ceph_repository.yml