Merge pull request #1336 from WingkaiHo/master

Load a variable file for devices partition

infrastructure-playbooks/make-osd-partitions.yml

@@ -26,10 +26,25 @@
     osd_group_name: osds
     journal_typecode: 45b0969e-9b03-4f30-b4c6-b4b80ceff106
     data_typecode: 4fbd7e29-9d25-41b8-afd0-062c0ceff05d
+    devices: []
   hosts:
   - "{{ osd_group_name }}"
 
   tasks:
+  
+  - name: load a variable file for devices partition
+    include_vars: "{{ item }}"
+    with_first_found:
+      - files:
+          - "host_vars/{{ ansible_hostname }}.yml"
+          - "host_vars/default.yml"
+        skip: true
+        
+  - name: exit playbook, if devices not defined
+    fail:
+      msg: "devices must be define in host_vars/default.yml or host_vars/{{ ansible_hostname }}.yml"
+    when: devices is not defined
+
   - name: install sgdisk(gdisk)
     package:
       name: gdisk

roles/ceph-mon/tasks/ceph_keys.yml

@@ -9,7 +9,6 @@
   when:
     - cephx
     - ceph_release_num.{{ ceph_release }} > ceph_release_num.jewel
-
 # NOTE (leseb): wait for mon discovery and quorum resolution
 # the admin key is not instantaneously created so we have to wait a bit
 - name: "wait for {{ cluster }}.client.admin.keyring exists"