diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-26 22:49:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-26 22:49:26 +0000 |
| commit | e4c027e3951bb8f939c119d73a81ca436550a339 (patch) | |
| tree | f91804d31d2eab5e847c099361fb73e989e51442 | |
| parent | 68ea0f55f42f49b33a654a682df126d4b1607eed (diff) | |
| parent | e76f862e99ea921b25ec66bc38fca36f026e954f (diff) | |
| download | kolla-e4c027e3951bb8f939c119d73a81ca436550a339.tar.gz kolla-e4c027e3951bb8f939c119d73a81ca436550a339.zip | |
Merge "Add upgrade play for ceph"
| -rw-r--r-- | ansible/roles/ceph/tasks/start_mons.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/ceph/tasks/start_osds.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/ceph/tasks/start_rgws.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/ceph/tasks/upgrade.yml | 15 |
4 files changed, 16 insertions, 5 deletions
diff --git a/ansible/roles/ceph/tasks/start_mons.yml b/ansible/roles/ceph/tasks/start_mons.yml index e555d8d5d..1bb2484a1 100644 --- a/ansible/roles/ceph/tasks/start_mons.yml +++ b/ansible/roles/ceph/tasks/start_mons.yml @@ -12,4 +12,3 @@ - "{{ node_config_directory }}/ceph-mon/:{{ container_config_directory }}/:ro" - "ceph_mon:/var/lib/ceph" - "ceph_mon_config:/etc/ceph" - when: inventory_hostname in groups['ceph-mon'] diff --git a/ansible/roles/ceph/tasks/start_osds.yml b/ansible/roles/ceph/tasks/start_osds.yml index 1324fd80e..1a59cbcd6 100644 --- a/ansible/roles/ceph/tasks/start_osds.yml +++ b/ansible/roles/ceph/tasks/start_osds.yml @@ -45,6 +45,4 @@ with_together: - id.results - osds - when: - - inventory_hostname in groups['ceph-osd'] - - osds + when: osds diff --git a/ansible/roles/ceph/tasks/start_rgws.yml b/ansible/roles/ceph/tasks/start_rgws.yml index 4de1e8afd..f8f963225 100644 --- a/ansible/roles/ceph/tasks/start_rgws.yml +++ b/ansible/roles/ceph/tasks/start_rgws.yml @@ -6,4 +6,3 @@ image: "{{ ceph_rgw_image_full }}" name: "ceph_rgw" volumes: "{{ node_config_directory }}/ceph-rgw/:{{ container_config_directory }}/:ro" - when: inventory_hostname in groups['ceph-rgw'] diff --git a/ansible/roles/ceph/tasks/upgrade.yml b/ansible/roles/ceph/tasks/upgrade.yml index ed97d539c..db8bf0730 100644 --- a/ansible/roles/ceph/tasks/upgrade.yml +++ b/ansible/roles/ceph/tasks/upgrade.yml @@ -1 +1,16 @@ --- +- include: config.yml + +- include: start_mons.yml + serial: "1" + when: inventory_hostname in groups['ceph-mon'] + +- include: start_osds.yml + serial: "1" + when: inventory_hostname in groups['ceph-osd'] + +- include: start_rgws.yml + serial: "30%" + when: + - inventory_hostname in groups['ceph-rgw'] + - enable_ceph_rgw | bool |