infrastructure-playbooks: update with ceph-defaults roles

Signed-off-by: Sébastien Han <seb@redhat.com>

infrastructure-playbooks/osd-configure.yml

@@ -10,9 +10,11 @@
 - hosts: mons
   become: True
   roles:
+    - ceph-defaults
     - ceph-fetch-keys
 
 - hosts: osds
   become: True
   roles:
-  - ceph-osd
+    - ceph-defaults
+    - ceph-osd

infrastructure-playbooks/rgw-standalone.yml

@@ -6,9 +6,11 @@
 - hosts: mons
   become: True
   roles:
+    - ceph-defaults
     - ceph-fetch-keys
 
 - hosts: rgws
   become: True
   roles:
-  - ceph-rgw
+    - ceph-defaults
+    - ceph-rgw

infrastructure-playbooks/shrink-mon.yml

@@ -27,7 +27,7 @@
       private: no
 
   tasks:
-  - include_vars: roles/ceph-common/defaults/main.yml
+  - include_vars: roles/ceph-defaults/defaults/main.yml
   - include_vars: group_vars/all.yml
 
   - name: exit playbook, if only one monitor is present in cluster

infrastructure-playbooks/shrink-osd.yml

@@ -27,7 +27,7 @@
       private: no
 
   tasks:
-  - include_vars: roles/ceph-common/defaults/main.yml
+  - include_vars: roles/ceph-defaults/defaults/main.yml
   - include_vars: group_vars/all.yml
 
   - name: exit playbook, if user did not mean to shrink cluster

infrastructure-playbooks/take-over-existing-cluster.yml

@@ -14,16 +14,17 @@
 - hosts: mons
   become: True
   vars_files:
-    - roles/ceph-common/defaults/main.yml
+    - roles/ceph-defaults/defaults/main.yml
     - group_vars/all.yml
   roles:
+    - ceph-defaults
     - ceph-fetch-keys
 
 - hosts: all
   become: true
 
   tasks:
-    - include_vars: roles/ceph-common/defaults/main.yml
+    - include_vars: roles/ceph-defaults/defaults/main.yml
     - include_vars: group_vars/all.yml
 
     - name: get the name of the existing ceph cluster