From 9619ef33d07b3c871f9a7fbcd35b7729820981e8 Mon Sep 17 00:00:00 2001 From: John Fulton Date: Mon, 19 Jun 2017 14:25:59 -0400 Subject: [PATCH] Add OpenStack metrics pool OpenStack's Gnocchi service expects to have a pool called "metrics". This change addess "metrics" to the list of `openstack_pools` and creates a corresponding key. It is only run if the user sets `openstack_config: false`. --- group_vars/mons.yml.sample | 5 +++++ roles/ceph-mon/defaults/main.yml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/group_vars/mons.yml.sample b/group_vars/mons.yml.sample index 838dfa230..f4750abc8 100644 --- a/group_vars/mons.yml.sample +++ b/group_vars/mons.yml.sample @@ -61,17 +61,22 @@ dummy: #openstack_cinder_backup_pool: # name: backups # pg_num: "{{ osd_pool_default_pg_num }}" +#openstack_gnocchi_pool: +# name: metrics +# pg_num: "{{ osd_pool_default_pg_num }}" #openstack_pools: # - "{{ openstack_glance_pool }}" # - "{{ openstack_cinder_pool }}" # - "{{ openstack_nova_pool }}" # - "{{ openstack_cinder_backup_pool }}" +# - "{{ openstack_gnocchi_pool }}" #openstack_keys: # - { 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 }}'" } +# - { name: client.gnocchi, value: "mon 'allow r' osd 'allow class-read object_prefix rbd_children, allow rwx pool={{ openstack_gnocchi_pool.name }}'" } ########## # DOCKER # diff --git a/roles/ceph-mon/defaults/main.yml b/roles/ceph-mon/defaults/main.yml index 36a0374a2..f627383c8 100644 --- a/roles/ceph-mon/defaults/main.yml +++ b/roles/ceph-mon/defaults/main.yml @@ -53,17 +53,22 @@ openstack_nova_pool: openstack_cinder_backup_pool: name: backups pg_num: "{{ osd_pool_default_pg_num }}" +openstack_gnocchi_pool: + name: metrics + pg_num: "{{ osd_pool_default_pg_num }}" openstack_pools: - "{{ openstack_glance_pool }}" - "{{ openstack_cinder_pool }}" - "{{ openstack_nova_pool }}" - "{{ openstack_cinder_backup_pool }}" + - "{{ openstack_gnocchi_pool }}" openstack_keys: - { 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 }}'" } + - { name: client.gnocchi, value: "mon 'allow r' osd 'allow class-read object_prefix rbd_children, allow rwx pool={{ openstack_gnocchi_pool.name }}'" } ########## # DOCKER #