From 835951b3d01bdc0fde21bfbeca87df40b7e93ecf Mon Sep 17 00:00:00 2001 From: git-harry Date: Mon, 17 Aug 2015 16:14:26 +0100 Subject: [PATCH] Allow configurable pg_num for OpenStack pools Currently the OpenStack pools that get created use the default pg_num. This commit updates the ceph-mon role to allow the pg_num for each pool to be customised. --- roles/ceph-mon/defaults/main.yml | 23 +++++++++++++++-------- roles/ceph-mon/tasks/openstack_config.yml | 2 +- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/roles/ceph-mon/defaults/main.yml b/roles/ceph-mon/defaults/main.yml index 5bc220fcc..d6e4e3ce2 100644 --- a/roles/ceph-mon/defaults/main.yml +++ b/roles/ceph-mon/defaults/main.yml @@ -36,16 +36,23 @@ secure_cluster_flags: ############# openstack_config: false -openstack_glance_pool: images -openstack_cinder_pool: volumes -openstack_nova_pool: vms -openstack_cinder_backup_pool: backups +openstack_glance_pool: + name: images + pg_num: "{{ pool_default_pg_num }}" +openstack_cinder_pool: + name: volumes + pg_num: "{{ pool_default_pg_num }}" +openstack_nova_pool: + name: vms + pg_num: "{{ pool_default_pg_num }}" +openstack_cinder_backup_pool: + name: backups + pg_num: "{{ pool_default_pg_num }}" openstack_keys: - - { name: client.glance, value: "mon 'allow r' osd 'allow class-read object_prefix rbd_children, allow rwx pool={{ openstack_glance_pool }}'" } - - { name: client.cinder, value: "mon 'allow r' osd 'allow class-read object_prefix rbd_children, allow rwx pool={{ openstack_cinder_pool }}, allow rwx pool={{ openstack_nova_pool }}, allow rx pool={{ openstack_glance_pool }}'" } - - { name: client.cinder-backup, value: "mon 'allow r' osd 'allow class-read object_prefix rbd_children, allow rwx pool={{ openstack_cinder_backup_pool }}'" } - + - { name: client.glance, value: "mon 'allow r' osd 'allow class-read object_prefix rbd_children, allow rwx pool={{ openstack_glance_pool.name }}'" } + - { name: client.cinder, value: "mon 'allow r' osd 'allow class-read object_prefix rbd_children, allow rwx pool={{ openstack_cinder_pool.name }}, allow rwx pool={{ openstack_nova_pool.name }}, allow rx pool={{ openstack_glance_pool.name }}'" } + - { name: client.cinder-backup, value: "mon 'allow r' osd 'allow class-read object_prefix rbd_children, allow rwx pool={{ openstack_cinder_backup_pool.name }}'" } ########## # DOCKER # diff --git a/roles/ceph-mon/tasks/openstack_config.yml b/roles/ceph-mon/tasks/openstack_config.yml index c05d244a6..9cd016125 100644 --- a/roles/ceph-mon/tasks/openstack_config.yml +++ b/roles/ceph-mon/tasks/openstack_config.yml @@ -1,6 +1,6 @@ --- - name: create openstack pool - command: rados mkpool {{ item }} + command: ceph osd pool create {{ item.name }} {{ item.pg_num }} with_items: - "{{ openstack_glance_pool }}" - "{{ openstack_cinder_pool }}" -- 2.47.3