openstack/kolla-ansible
Code Issues Proposed changes

Merge "Allow operators to use 'fallback mode' for Ceph disks"

Browse Source
This commit is contained in:
Jenkins 2017-01-17 19:11:12 +00:00 committed by Gerrit Code Review
commit d8180c52e1
5 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ansible/roles/ceph/defaults/main.yml
View File

@ -30,3 +30,8 @@ swift_internal_endpoint: "{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{
swift_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn }}:{{ rgw_port }}/swift/v1" swift_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn }}:{{ rgw_port }}/swift/v1"
openstack_swift_auth: "{'auth_url':'{{ openstack_auth.auth_url }}','username':'{{ openstack_auth.username }}','password':'{{ openstack_auth.password }}','project_name':'{{ openstack_auth.project_name }}','domain_name':'default'}" openstack_swift_auth: "{'auth_url':'{{ openstack_auth.auth_url }}','username':'{{ openstack_auth.username }}','password':'{{ openstack_auth.password }}','project_name':'{{ openstack_auth.project_name }}','domain_name':'default'}"
####################
# Kolla
####################
kolla_ceph_use_udev: True

4
ansible/roles/ceph/tasks/bootstrap_osds.yml
View File

@ -2,7 +2,7 @@
- name: Looking up disks to bootstrap for Ceph OSDs - name: Looking up disks to bootstrap for Ceph OSDs
command: docker exec -t kolla_toolbox sudo -E /usr/bin/ansible localhost command: docker exec -t kolla_toolbox sudo -E /usr/bin/ansible localhost
-m find_disks -m find_disks
-a "partition_name='KOLLA_CEPH_OSD_BOOTSTRAP' match_mode='prefix'" -a "partition_name='KOLLA_CEPH_OSD_BOOTSTRAP' match_mode='prefix' use_udev={{ kolla_ceph_use_udev }}"
register: osd_lookup register: osd_lookup
changed_when: "{{ osd_lookup.stdout.find('localhost | SUCCESS => ') != -1 and (osd_lookup.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}" 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' failed_when: osd_lookup.stdout.split()[2] != 'SUCCESS'
@ -14,7 +14,7 @@
- name: Looking up disks to bootstrap for Ceph Cache OSDs - name: Looking up disks to bootstrap for Ceph Cache OSDs
command: docker exec -t kolla_toolbox sudo -E /usr/bin/ansible localhost command: docker exec -t kolla_toolbox sudo -E /usr/bin/ansible localhost
-m find_disks -m find_disks
-a "partition_name='KOLLA_CEPH_OSD_CACHE_BOOTSTRAP' match_mode='prefix'" -a "partition_name='KOLLA_CEPH_OSD_CACHE_BOOTSTRAP' match_mode='prefix' use_udev={{ kolla_ceph_use_udev }}"
register: osd_cache_lookup 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 }}" 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' failed_when: osd_cache_lookup.stdout.split()[2] != 'SUCCESS'

2
ansible/roles/ceph/tasks/reconfigure.yml
View File

@ -12,7 +12,7 @@
- name: Looking up OSDs for Ceph - name: Looking up OSDs for Ceph
command: docker exec -t kolla_toolbox sudo -E /usr/bin/ansible localhost command: docker exec -t kolla_toolbox sudo -E /usr/bin/ansible localhost
-m find_disks -m find_disks
-a "partition_name='KOLLA_CEPH_DATA' match_mode='prefix'" -a "partition_name='KOLLA_CEPH_DATA' match_mode='prefix' use_udev={{ kolla_ceph_use_udev }}"
register: osd_lookup register: osd_lookup
changed_when: "{{ osd_lookup.stdout.find('localhost | SUCCESS => ') != -1 and (osd_lookup.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}" 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' failed_when: osd_lookup.stdout.split()[2] != 'SUCCESS'

2
ansible/roles/ceph/tasks/start_osds.yml
View File

@ -2,7 +2,7 @@
- name: Looking up OSDs for Ceph - name: Looking up OSDs for Ceph
command: docker exec -t kolla_toolbox sudo -E /usr/bin/ansible localhost command: docker exec -t kolla_toolbox sudo -E /usr/bin/ansible localhost
-m find_disks -m find_disks
-a "partition_name='KOLLA_CEPH_DATA' match_mode='prefix'" -a "partition_name='KOLLA_CEPH_DATA' match_mode='prefix' use_udev={{ kolla_ceph_use_udev }}"
register: osd_lookup register: osd_lookup
changed_when: "{{ osd_lookup.stdout.find('localhost | SUCCESS => ') != -1 and (osd_lookup.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}" 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' failed_when: osd_lookup.stdout.split()[2] != 'SUCCESS'

7
releasenotes/notes/allow-ceph-toggle-udev-2d2b04c08c895820.yaml Normal file
View File

@ -0,0 +1,7 @@
---
features:
- Add a new variable for the Ceph role, 'kolla_ceph_use_udev',
which when set to 'False' relies on system tools such as
sgdisk/blkid to read the necessary disk info required
to bootstrap Ceph disks on older systems. Most operators
should not need to change this.