Merge "Allow ceph role to pull images"

ansible/roles/ceph/tasks/deploy.yml

@@ -0,0 +1,21 @@
+---
+- include: config.yml
+
+- include: bootstrap_mons.yml
+  when: inventory_hostname in groups['ceph-mon']
+
+- include: distribute_keyrings.yml
+
+- include: start_mons.yml
+  when: inventory_hostname in groups['ceph-mon']
+
+- include: bootstrap_osds.yml
+  when: inventory_hostname in groups['ceph-osd']
+
+- include: start_osds.yml
+  when: inventory_hostname in groups['ceph-osd']
+
+- include: start_rgws.yml
+  when:
+    - inventory_hostname in groups['ceph-rgw']
+    - enable_ceph_rgw | bool

ansible/roles/ceph/tasks/main.yml

@@ -1,21 +1,2 @@
 ---
-- include: config.yml
-
-- include: bootstrap_mons.yml
-  when: inventory_hostname in groups['ceph-mon']
-
-- include: distribute_keyrings.yml
-
-- include: start_mons.yml
-  when: inventory_hostname in groups['ceph-mon']
-
-- include: bootstrap_osds.yml
-  when: inventory_hostname in groups['ceph-osd']
-
-- include: start_osds.yml
-  when: inventory_hostname in groups['ceph-osd']
-
-- include: start_rgws.yml
-  when:
-    - inventory_hostname in groups['ceph-rgw']
-    - enable_ceph_rgw | bool
+- include: "{{ action }}.yml"

ansible/roles/ceph/tasks/pull.yml

@@ -0,0 +1,21 @@
+---
+- name: Pulling ceph-mon image
+  kolla_docker:
+    action: "pull_image"
+    common_options: "{{ docker_common_options }}"
+    image: "{{ ceph_mon_image_full }}"
+  when: inventory_hostname in groups['ceph-mon']
+
+- name: Pulling ceph-osd image
+  kolla_docker:
+    action: "pull_image"
+    common_options: "{{ docker_common_options }}"
+    image: "{{ ceph_osd_image_full }}"
+  when: inventory_hostname in groups['ceph-osd']
+
+- name: Pulling ceph-rgw image
+  kolla_docker:
+    action: "pull_image"
+    common_options: "{{ docker_common_options }}"
+    image: "{{ ceph_rgw_image_full }}"
+  when: inventory_hostname in groups['ceph-rgw']