Ubuntu support and fixes (#7)

* Ubuntu support

* Fix cephadm_bootstrap fact

* Fix public key save/copy

* Use ansible_hostname instead of inventory_hostname in specs

* Fix usage of empty cephadm_fsid

Author: mnasiadka

roles/cephadm/defaults/main.yml

@@ -1,4 +1,5 @@
 ---
+cephadm_ceph_release: octopus
 cephadm_skip_prechecks: False
 # FSID
 cephadm_fsid: ""

roles/cephadm/tasks/bootstrap.yml

@@ -21,7 +21,9 @@
            --registry-password={{ cephadm_registry_password }}
            {% endif %}
            --skip-pull
+           {% if cephadm_fsid | length > 0 %}
            --fsid={{ cephadm_fsid }}
+           {% endif %}
            --mon-ip={{ mon_ip }}
     become: true
     when: not cephadm_check_ceph_conf.stat.exists
@@ -37,10 +39,19 @@
     when: cephadm_cluster_network | length > 0
     become: true
 
+  - name: Get cluster fsid
+    command:
+      cmd: "cephadm shell -- ceph fsid"
+    when: cephadm_fsid | length == 0
+    become: true
+    register: cephadm_fsid_current
+
   - name: Template out cluster.yml
+    vars:
+      fsid: "{{ cephadm_fsid if cephadm_fsid | length > 0 else cephadm_fsid_current.stdout }}"
     template:
       src: "templates/cluster.yml.j2"
-      dest: "/var/run/ceph/{{ cephadm_fsid }}/cephadm_cluster.yml"
+      dest: "/var/run/ceph/{{ fsid }}/cephadm_cluster.yml"
       owner: root
       group: root
       mode: 0644

roles/cephadm/tasks/main.yml

@@ -5,6 +5,8 @@
 - include_tasks: "prechecks.yml"
   when: not cephadm_skip_prechecks | bool
 
+- include_tasks: "pkg_{{ ansible_os_family | lower }}.yml"
+
 - include_tasks: "prereqs.yml"
 
 - include_tasks: "bootstrap.yml"

roles/cephadm/tasks/pkg_debian.yml

@@ -0,0 +1,19 @@
+---
+- name: Add Ceph signing keys
+  apt_key:
+    keyserver: keyserver.ubuntu.com
+    id: E84AC2C0460F3994
+  become: true
+
+- name: Add Ceph repository
+  apt_repository:
+    repo: "deb https://download.ceph.com/debian-{{ cephadm_ceph_release }}/ {{ ansible_distribution_release }} main"
+    state: present
+  when: not cephadm_custom_repos | bool
+  become: true
+
+- name: Install cephadm package
+  apt:
+    name: "cephadm"
+    state: present
+  become: true

roles/cephadm/tasks/pkg_redhat.yml

@@ -0,0 +1,13 @@
+---
+- name: Install centos-release-ceph-octopus package
+  dnf:
+    name: "centos-release-ceph-octopus"
+    state: present
+  when: not cephadm_custom_repos | bool
+  become: true
+
+- name: Install cephadm package
+  dnf:
+    name: "cephadm"
+    state: present
+  become: true

roles/cephadm/tasks/prechecks.yml

@@ -5,4 +5,4 @@
 - name: Set cephadm_bootstrap
   set_fact:
     cephadm_bootstrap: True
-  when: ansible_facts.services['ceph.target'] is defined
+  when: ansible_facts.services['ceph.target'] is not defined

roles/cephadm/tasks/prereqs.yml

@@ -1,17 +1,4 @@
 ---
-- name: Install centos-release-ceph-octopus package
-  dnf:
-    name: "centos-release-ceph-octopus"
-    state: present
-  when: not cephadm_custom_repos | bool
-  become: true
-
-- name: Install cephadm package
-  dnf:
-    name: "cephadm"
-    state: present
-  become: true
-
 - name: Prepare cephadm bootstrap dependencies
   block:
   - name: Ensure /etc/ceph directory exists
@@ -44,7 +31,7 @@
 
   - name: Save public key
     copy:
-      content: "{{ cephadm_ssh_key.public_key }}"
+      content: "{{ cephadm_ssh_key.public_key | default }}"
       dest: "{{ cephadm_ssh_public_key }}"
       owner: root
       group: root
@@ -55,8 +42,10 @@
   run_once: True
 
 - name: Copy cephadm public key to all hosts
+  vars:
+    content: "{{ lookup('file', cephadm_ssh_public_key) if cephadm_check_ceph_id.stat.exists else cephadm_ssh_key.public_key }}"
   authorized_key:
     user: root
     state: present
-    key: "{{ cephadm_ssh_key.public_key }}"
+    key: "{{ content }}"
   become: true

roles/cephadm/templates/cluster.yml.j2

@@ -1,7 +1,7 @@
 {% for host in groups['ceph'] %}
 ---
 service_type: host
-hostname: {{ host }}
+hostname: {{ hostvars[host]['ansible_hostname'] }}
 labels:
 {% if host in groups['mons'] %}
 - mon