openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Set default application for Ceph Luminous openstack_pools" into stable/queens

This commit is contained in:
Zuul 2018-06-01 01:07:51 +00:00 committed by Gerrit Code Review
parent 4ffda1209a e491cbdbaa
commit 8824e7abcd
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docker/services/ceph-ansible/ceph-base.yaml
View File

@ -246,6 +246,7 @@ outputs:
name: <%pool%>
pg_num: {get_param: CephPoolDefaultPgNum}
rule_name: ""
application: rbd
for_each:
<%pool%>:
list_concat_unique:
@ -253,9 +254,15 @@ outputs:
- {get_param: CinderBackupRbdPoolName}
- {get_param: NovaRbdPoolName}
- {get_param: GlanceRbdPoolName}
- {get_param: GnocchiRbdPoolName}
# CinderRbdExtraPools is a list (do not indent further)
- {get_param: CinderRbdExtraPools}
- if:
- equals: [{get_param: GnocchiRbdPoolName}, '']
- []
- - name: {get_param: GnocchiRbdPoolName}
pg_num: {get_param: CephPoolDefaultPgNum}
rule_name: ""
application: openstack_gnocchi
- {get_param: CephPools}
openstack_keys: &openstack_keys
- name:

1
environments/disable-telemetry.yaml
View File

@ -18,3 +18,4 @@ resource_registry:
parameter_defaults:
NotificationDriver: 'noop'
GnocchiRbdPoolName: ''