diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-21 14:17:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-21 14:17:24 +0000 |
| commit | ff3095f56ec4ea7a60c044dffe048aaedbfaafe2 (patch) | |
| tree | 8b0c131b84cac1fcc4151634a29a3b7398d06702 /ansible/roles/ceph | |
| parent | b333f44a534374ac59a0e78960fc40f6cf6a6715 (diff) | |
| parent | 5250a00781a214911fec78718ef6dfb91154b0de (diff) | |
| download | kolla-ff3095f56ec4ea7a60c044dffe048aaedbfaafe2.tar.gz kolla-ff3095f56ec4ea7a60c044dffe048aaedbfaafe2.zip | |
Merge "Allow external ceph journals and fix bootstrap"
Diffstat (limited to 'ansible/roles/ceph')
| -rw-r--r-- | ansible/roles/ceph/tasks/bootstrap_osds.yml | 16 | ||||
| -rw-r--r-- | ansible/roles/ceph/tasks/start_osds.yml | 4 |
2 files changed, 16 insertions, 4 deletions
diff --git a/ansible/roles/ceph/tasks/bootstrap_osds.yml b/ansible/roles/ceph/tasks/bootstrap_osds.yml index 16599170e..471d173c9 100644 --- a/ansible/roles/ceph/tasks/bootstrap_osds.yml +++ b/ansible/roles/ceph/tasks/bootstrap_osds.yml @@ -2,7 +2,7 @@ - name: Looking up disks to bootstrap for Ceph command: docker exec -t kolla_toolbox /usr/bin/ansible localhost -m find_disks - -a "partition_name='KOLLA_CEPH_OSD_BOOTSTRAP'" + -a "partition_name='KOLLA_CEPH_OSD_BOOTSTRAP' match_mode='prefix'" register: osd_lookup changed_when: "{{ osd_lookup.stdout.find('localhost | SUCCESS => ') != -1 and (osd_lookup.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}" failed_when: osd_lookup.stdout.split()[2] != 'SUCCESS' @@ -14,7 +14,7 @@ - name: Looking up disks to bootstrap for Ceph command: docker exec -t kolla_toolbox /usr/bin/ansible localhost -m find_disks - -a "partition_name='KOLLA_CEPH_OSD_CACHE_BOOTSTRAP'" + -a "partition_name='KOLLA_CEPH_OSD_CACHE_BOOTSTRAP' match_mode='prefix'" register: osd_cache_lookup changed_when: "{{ osd_cache_lookup.stdout.find('localhost | SUCCESS => ') != -1 and (osd_cache_lookup.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}" failed_when: osd_cache_lookup.stdout.split()[2] != 'SUCCESS' @@ -32,6 +32,12 @@ KOLLA_BOOTSTRAP: KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" OSD_DEV: "{{ item.1.device }}" + OSD_PARTITION: "{{ item.1.partition }}" + OSD_PARTITION_NUM: "{{ item.1.partition_num }}" + JOURNAL_DEV: "{{ item.1.journal_device }}" + JOURNAL_PARTITION: "{{ item.1.journal }}" + JOURNAL_PARTITION_NUM: "{{ item.1.journal_num }}" + USE_EXTERNAL_JOURNAL: "{{ item.1.external_journal | bool }}" OSD_FILESYSTEM: "{{ ceph_osd_filesystem }}" OSD_INITIAL_WEIGHT: "{{ osd_initial_weight }}" HOSTNAME: "{{ hostvars[inventory_hostname]['ansible_' + storage_interface]['ipv4']['address'] }}" @@ -56,6 +62,12 @@ KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" CEPH_CACHE: OSD_DEV: "{{ item.1.device }}" + OSD_PARTITION: "{{ item.1.partition }}" + OSD_PARTITION_NUM: "{{ item.1.partition_num }}" + JOURNAL_DEV: "{{ item.1.journal_device }}" + JOURNAL_PARTITION: "{{ item.1.journal }}" + JOURNAL_PARTITION_NUM: "{{ item.1.journal_num }}" + USE_EXTERNAL_JOURNAL: "{{ item.1.external_journal | bool }}" OSD_FILESYSTEM: "{{ ceph_osd_filesystem }}" OSD_INITIAL_WEIGHT: "{{ osd_initial_weight }}" HOSTNAME: "{{ hostvars[inventory_hostname]['ansible_' + storage_interface]['ipv4']['address'] }}" diff --git a/ansible/roles/ceph/tasks/start_osds.yml b/ansible/roles/ceph/tasks/start_osds.yml index 3f2bdd4cd..63787dd12 100644 --- a/ansible/roles/ceph/tasks/start_osds.yml +++ b/ansible/roles/ceph/tasks/start_osds.yml @@ -2,7 +2,7 @@ - name: Looking up OSDs for Ceph command: docker exec -t kolla_toolbox /usr/bin/ansible localhost -m find_disks - -a "partition_name='KOLLA_CEPH_DATA'" + -a "partition_name='KOLLA_CEPH_DATA' match_mode='prefix'" register: osd_lookup changed_when: "{{ osd_lookup.stdout.find('localhost | SUCCESS => ') != -1 and (osd_lookup.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}" failed_when: osd_lookup.stdout.split()[2] != 'SUCCESS' @@ -34,7 +34,7 @@ environment: KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" OSD_ID: "{{ item.0.stdout }}" - OSD_DEV: "{{ item.1['device'] }}" + JOURNAL_PARTITION: "{{ item.1.journal }}" image: "{{ ceph_osd_image_full }}" name: "ceph_osd_{{ item.0.stdout }}" pid_mode: "host" |