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.

diff --git a/roles/ceph-mon/defaults/main.yml b/roles/ceph-mon/defaults/main.yml
index 5bc220fcc96f1c9769776b557b5aa1919076b148..d6e4e3ce22b03ee103854042d6f11f21ca257aa7 100644 (file)
--- a/roles/ceph-mon/defaults/main.yml
+++ b/roles/ceph-mon/defaults/main.yml
@@ -36,16 +36,23 @@ secure_cluster_flags:
 #############\r
 \r
 openstack_config: false\r
-openstack_glance_pool: images\r
-openstack_cinder_pool: volumes\r
-openstack_nova_pool: vms\r
-openstack_cinder_backup_pool: backups\r
+openstack_glance_pool:\r
+  name: images\r
+  pg_num: "{{ pool_default_pg_num }}"\r
+openstack_cinder_pool:\r
+  name: volumes\r
+  pg_num: "{{ pool_default_pg_num }}"\r
+openstack_nova_pool:\r
+  name: vms\r
+  pg_num: "{{ pool_default_pg_num }}"\r
+openstack_cinder_backup_pool:\r
+  name: backups\r
+  pg_num: "{{ pool_default_pg_num }}"\r
 \r
 openstack_keys:\r
-  - { name: client.glance, value: "mon 'allow r' osd 'allow class-read object_prefix rbd_children, allow rwx pool={{ openstack_glance_pool }}'" }\r
-  - { 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 }}'"  }\r
-  - { name: client.cinder-backup, value: "mon 'allow r' osd 'allow class-read object_prefix rbd_children, allow rwx pool={{ openstack_cinder_backup_pool }}'" }\r
-\r
+  - { name: client.glance, value: "mon 'allow r' osd 'allow class-read object_prefix rbd_children, allow rwx pool={{ openstack_glance_pool.name }}'" }\r
+  - { 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 }}'"  }\r
+  - { name: client.cinder-backup, value: "mon 'allow r' osd 'allow class-read object_prefix rbd_children, allow rwx pool={{ openstack_cinder_backup_pool.name }}'" }\r
 \r
 ##########\r
 # DOCKER #\r

diff --git a/roles/ceph-mon/tasks/openstack_config.yml b/roles/ceph-mon/tasks/openstack_config.yml
index c05d244a6ce1cd1801edf062b05037a1cbc7347f..9cd0161255f328172e80d20182fa7c532615307d 100644 (file)
--- 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 }}"