diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-05 11:36:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-05 11:36:24 +0000 |
| commit | c8bc8fdb1bb3c6fa972316991007a112035070ef (patch) | |
| tree | 69b99820bdd3337baf9e37c15b000feb4aae22d3 | |
| parent | 900bc1ed026d839081d7cc2d40c702979ca6757e (diff) | |
| parent | cba75b4084d00c892157a6bae3421106e935fa62 (diff) | |
| download | kolla-c8bc8fdb1bb3c6fa972316991007a112035070ef.tar.gz kolla-c8bc8fdb1bb3c6fa972316991007a112035070ef.zip | |
Merge "Allow ceph role to pull images"
| -rw-r--r-- | ansible/roles/ceph/tasks/deploy.yml | 21 | ||||
| -rw-r--r-- | ansible/roles/ceph/tasks/main.yml | 21 | ||||
| -rw-r--r-- | ansible/roles/ceph/tasks/pull.yml | 21 |
3 files changed, 43 insertions, 20 deletions
diff --git a/ansible/roles/ceph/tasks/deploy.yml b/ansible/roles/ceph/tasks/deploy.yml new file mode 100644 index 000000000..403265af7 --- /dev/null +++ b/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 diff --git a/ansible/roles/ceph/tasks/main.yml b/ansible/roles/ceph/tasks/main.yml index 403265af7..b017e8b4a 100644 --- a/ansible/roles/ceph/tasks/main.yml +++ b/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" diff --git a/ansible/roles/ceph/tasks/pull.yml b/ansible/roles/ceph/tasks/pull.yml new file mode 100644 index 000000000..fde080f96 --- /dev/null +++ b/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'] |