diff options
| author | Sam Yaple <sam@yaple.net> | 2015-10-18 19:38:42 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-10-22 10:51:44 +0000 |
| commit | 6932ca48b8830cc179e7cccf15d68bc58391b900 (patch) | |
| tree | cefa62d69437b6e9de31566f375c860323c1d47f | |
| parent | 331e2f3bef422e9a04c2ad38e2f670008d853dd2 (diff) | |
| download | kolla-6932ca48b8830cc179e7cccf15d68bc58391b900.tar.gz kolla-6932ca48b8830cc179e7cccf15d68bc58391b900.zip | |
Allow specifying erasure as the pool type
Change-Id: I581efd7c0d138cb78ab3afd755521f3fb375c0ee
Partially-Implements: blueprint ceph-improvements
| -rw-r--r-- | ansible/group_vars/all.yml | 9 | ||||
| -rw-r--r-- | ansible/roles/cinder/tasks/ceph.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/glance/tasks/ceph.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/nova/tasks/ceph.yml | 2 | ||||
| -rw-r--r-- | etc/kolla/globals.yml | 8 |
5 files changed, 21 insertions, 4 deletions
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 845c7e443..a44369dd8 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -151,6 +151,7 @@ enable_ironic: "no" ironic_keystone_user: "ironic" + #################### # RabbitMQ options #################### @@ -167,3 +168,11 @@ haproxy_user: "openstack" # Cinder - Block Storage options ################################# cinder_volume_driver: "{{ 'ceph' if enable_ceph | bool else 'lvm' }}" + + +################### +# Ceph options +################### +# 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/cinder/tasks/ceph.yml b/ansible/roles/cinder/tasks/ceph.yml index 927531883..a26b99bb2 100644 --- a/ansible/roles/cinder/tasks/ceph.yml +++ b/ansible/roles/cinder/tasks/ceph.yml @@ -19,7 +19,7 @@ # TODO(SamYaple): Improve failed_when and changed_when tests - name: Creating ceph pool for cinder - command: docker exec ceph_mon ceph osd pool create volumes 128 + command: docker exec ceph_mon ceph osd pool create volumes 128 {{ ceph_pool_type }} delegate_to: "{{ groups['ceph-mon'][0] }}" changed_when: False failed_when: False @@ -27,7 +27,7 @@ # TODO(SamYaple): Improve failed_when and changed_when tests - name: Creating ceph pool for cinder-backup - command: docker exec ceph_mon ceph osd pool create backups 128 + command: docker exec ceph_mon ceph osd pool create backups 128 {{ ceph_pool_type }} delegate_to: "{{ groups['ceph-mon'][0] }}" changed_when: False failed_when: False diff --git a/ansible/roles/glance/tasks/ceph.yml b/ansible/roles/glance/tasks/ceph.yml index b1270eb8e..f690ecd70 100644 --- a/ansible/roles/glance/tasks/ceph.yml +++ b/ansible/roles/glance/tasks/ceph.yml @@ -13,7 +13,7 @@ # TODO(SamYaple): Improve failed_when and changed_when tests - name: Creating ceph pool for glance - command: docker exec ceph_mon ceph osd pool create images 128 + command: docker exec ceph_mon ceph osd pool create images 128 {{ ceph_pool_type }} delegate_to: "{{ groups['ceph-mon'][0] }}" changed_when: False failed_when: False diff --git a/ansible/roles/nova/tasks/ceph.yml b/ansible/roles/nova/tasks/ceph.yml index b7dffcc57..4f68a469e 100644 --- a/ansible/roles/nova/tasks/ceph.yml +++ b/ansible/roles/nova/tasks/ceph.yml @@ -19,7 +19,7 @@ # TODO(SamYaple): Improve failed_when and changed_when tests - name: Creating ceph pool for vms - command: docker exec ceph_mon ceph osd pool create vms 128 + command: docker exec ceph_mon ceph osd pool create vms 128 {{ ceph_pool_type }} delegate_to: "{{ groups['ceph-mon'][0] }}" changed_when: False failed_when: False diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index 57b9e27bd..1a078295d 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -84,3 +84,11 @@ neutron_external_interface: "eth1" # OpenStack services can be enabled or disabled with these options #enable_cinder: "yes" #enable_heat: "no" + + +################### +# Ceph options +################### +# A requirement for using the erasure-coded pools is you must setup a cache tier +# Valid options are [ erasure, replicated ] +# ceph_pool_type: "replicated" |