Merge pull request #611 from ceph/rhcs-debian

support for the jewel version of red hat ceph storage on ubuntu

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

@@ -0,0 +1,34 @@
+---
+- name: add the red hat storage apt-key
+  apt_key:
+    url: "https://www.redhat.com/security/fd431d51.txt"
+    state: present
+
+- name: install dependencies
+  apt:
+    pkg: "{{ item }}"
+    state: present
+    update_cache: yes
+    cache_valid_time: 3600
+  with_items: debian_package_dependencies
+
+- name: install red hat storage ceph mon
+  apt:
+    name: ceph-mon
+    state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
+  when:
+    mon_group_name in group_names
+
+- name: install red hat storage ceph osd
+  apt:
+    name: ceph-osd
+    state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
+  when:
+    osd_group_name in group_names
+
+- name: install ceph-test
+  apt:
+    name: ceph-test
+    state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
+  when:
+    ceph_test

roles/ceph-common/tasks/main.yml

@@ -16,14 +16,16 @@
 - include: ./pre_requisites/prerequisite_rh_storage_iso_install.yml
   when:
     ceph_stable_rh_storage and
-    ceph_stable_rh_storage_iso_install
+    ceph_stable_rh_storage_iso_install and
+    ansible_os_family == "RedHat"
   tags:
     - package-install
 
 - include: ./pre_requisites/prerequisite_rh_storage_cdn_install.yml
   when:
     ceph_stable_rh_storage and
-    ceph_stable_rh_storage_cdn_install
+    ceph_stable_rh_storage_cdn_install and
+    ansible_os_family == "RedHat"
   tags:
     - package-install
 
@@ -33,7 +35,16 @@
     - package-install
 
 - include: ./installs/install_on_debian.yml
-  when: ansible_os_family == 'Debian'
+  when:
+    ansible_os_family == 'Debian' and
+    not ceph_stable_rh_storage
+  tags:
+    - package-install
+
+- include: ./installs/install_rh_storage_on_debian.yml
+  when:
+    ansible_os_family == 'Debian' and
+    ceph_stable_rh_storage
   tags:
     - package-install
 
@@ -66,6 +77,12 @@
 - set_fact:
     is_ceph_infernalis={{ (ceph_stable and ceph_stable_release not in ceph_stable_releases) or (ceph_dev) or (ceph_stable_rh_storage and (rh_storage_version.stdout | version_compare('0.94', '>'))) }}
 
+- set_fact:
+    is_ceph_infernalis=True
+  when:
+    ansible_os_family == 'Debian' and
+    ceph_stable_rh_storage
+
 - set_fact:
     dir_owner: ceph
     dir_group: ceph