diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-21 09:26:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-21 09:26:14 +0000 |
| commit | 25af34ce7423f7aee2f14d1c7a194642ed72a1c2 (patch) | |
| tree | 9a6d7de294dd81c24ba6b3a8bede544acf947b9f /ansible | |
| parent | 39ac7fab7b4398ad2fbfc9dc9d84d24f4ebee68b (diff) | |
| parent | 6d0cd535d34ac10f144ab5d909256364363e7f38 (diff) | |
| download | kolla-25af34ce7423f7aee2f14d1c7a194642ed72a1c2.tar.gz kolla-25af34ce7423f7aee2f14d1c7a194642ed72a1c2.zip | |
Merge "Allow user to choose filesystem for osd"
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/group_vars/all.yml | 6 | ||||
| -rw-r--r-- | ansible/roles/ceph/tasks/bootstrap_osds.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/ceph/tasks/start_osds.yml | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 30f4b3172..bfa4c2051 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -225,6 +225,12 @@ ceph_enable_cache: "no" # Valid options are [ forward, none, writeback ] ceph_cache_mode: "writeback" +# Valid options are [ ext4, btrfs, xfs ] +ceph_osd_filesystem: "xfs" + +# These are /etc/fstab options. Comma seperated, no spaces (see fstab(8)) +ceph_osd_mount_options: "defaults,noatime" + # A requirement for using the erasure-coded pools is you must setup a cache tier # Valid options are [ erasure, replicated ] ceph_pool_type: "replicated" diff --git a/ansible/roles/ceph/tasks/bootstrap_osds.yml b/ansible/roles/ceph/tasks/bootstrap_osds.yml index 38ad2de44..16599170e 100644 --- a/ansible/roles/ceph/tasks/bootstrap_osds.yml +++ b/ansible/roles/ceph/tasks/bootstrap_osds.yml @@ -32,6 +32,7 @@ KOLLA_BOOTSTRAP: KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" OSD_DEV: "{{ item.1.device }}" + OSD_FILESYSTEM: "{{ ceph_osd_filesystem }}" OSD_INITIAL_WEIGHT: "{{ osd_initial_weight }}" HOSTNAME: "{{ hostvars[inventory_hostname]['ansible_' + storage_interface]['ipv4']['address'] }}" image: "{{ ceph_osd_image_full }}" @@ -55,6 +56,7 @@ KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" CEPH_CACHE: OSD_DEV: "{{ item.1.device }}" + OSD_FILESYSTEM: "{{ ceph_osd_filesystem }}" OSD_INITIAL_WEIGHT: "{{ osd_initial_weight }}" HOSTNAME: "{{ hostvars[inventory_hostname]['ansible_' + storage_interface]['ipv4']['address'] }}" image: "{{ ceph_osd_image_full }}" diff --git a/ansible/roles/ceph/tasks/start_osds.yml b/ansible/roles/ceph/tasks/start_osds.yml index 1a59cbcd6..3f2bdd4cd 100644 --- a/ansible/roles/ceph/tasks/start_osds.yml +++ b/ansible/roles/ceph/tasks/start_osds.yml @@ -14,9 +14,10 @@ - name: Mounting Ceph OSD volumes mount: src: "UUID={{ item.fs_uuid }}" - fstype: xfs + fstype: "{{ ceph_osd_filesystem }}" state: mounted name: "/var/lib/ceph/osd/{{ item['fs_uuid'] }}" + opts: "{{ ceph_osd_mount_options }}" with_items: osds - name: Gathering OSD IDs |