Merge "Set default application for Ceph Luminous openstack_pools" into stable/queens
This commit is contained in:
commit
8824e7abcd
|
@ -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:
|
||||
|
|
|
@ -18,3 +18,4 @@ resource_registry:
|
|||
|
||||
parameter_defaults:
|
||||
NotificationDriver: 'noop'
|
||||
GnocchiRbdPoolName: ''
|
||||
|
|
Loading…
Reference in New Issue