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`.
pull/1612/head
John Fulton 2017-06-19 14:25:59 -04:00
parent 62192df644
commit 9619ef33d0
2 changed files with 10 additions and 0 deletions

View File

@ -61,17 +61,22 @@ dummy:
#openstack_cinder_backup_pool: #openstack_cinder_backup_pool:
# name: backups # name: backups
# pg_num: "{{ osd_pool_default_pg_num }}" # pg_num: "{{ osd_pool_default_pg_num }}"
#openstack_gnocchi_pool:
# name: metrics
# pg_num: "{{ osd_pool_default_pg_num }}"
#openstack_pools: #openstack_pools:
# - "{{ openstack_glance_pool }}" # - "{{ openstack_glance_pool }}"
# - "{{ openstack_cinder_pool }}" # - "{{ openstack_cinder_pool }}"
# - "{{ openstack_nova_pool }}" # - "{{ openstack_nova_pool }}"
# - "{{ openstack_cinder_backup_pool }}" # - "{{ openstack_cinder_backup_pool }}"
# - "{{ openstack_gnocchi_pool }}"
#openstack_keys: #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.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, 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.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 # # DOCKER #

View File

@ -53,17 +53,22 @@ openstack_nova_pool:
openstack_cinder_backup_pool: openstack_cinder_backup_pool:
name: backups name: backups
pg_num: "{{ osd_pool_default_pg_num }}" pg_num: "{{ osd_pool_default_pg_num }}"
openstack_gnocchi_pool:
name: metrics
pg_num: "{{ osd_pool_default_pg_num }}"
openstack_pools: openstack_pools:
- "{{ openstack_glance_pool }}" - "{{ openstack_glance_pool }}"
- "{{ openstack_cinder_pool }}" - "{{ openstack_cinder_pool }}"
- "{{ openstack_nova_pool }}" - "{{ openstack_nova_pool }}"
- "{{ openstack_cinder_backup_pool }}" - "{{ openstack_cinder_backup_pool }}"
- "{{ openstack_gnocchi_pool }}"
openstack_keys: 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.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, 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.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 # # DOCKER #