Make CephPools override properties of other pools
Previously it was possible to use CephPools tol override properties of any pool, not only the additional ones defined via CephPools parameter. This change restores the functionality which was broken with the migration of the templates to ceph-ansible. Change-Id: Id184d5e7fe60c789944159ea32dc1267aca9decb Closes-Bug: #1734093
This commit is contained in:
parent
f25a2a5414
commit
9207b00ace
@ -218,23 +218,26 @@ outputs:
|
||||
ceph_origin: distro
|
||||
openstack_config: true
|
||||
openstack_pools:
|
||||
list_concat_unique:
|
||||
- repeat:
|
||||
template:
|
||||
name: <%pool%>
|
||||
pg_num: {get_param: CephPoolDefaultPgNum}
|
||||
rule_name: ""
|
||||
for_each:
|
||||
<%pool%>:
|
||||
list_concat_unique:
|
||||
- - {get_param: CinderRbdPoolName}
|
||||
- {get_param: CinderBackupRbdPoolName}
|
||||
- {get_param: NovaRbdPoolName}
|
||||
- {get_param: GlanceRbdPoolName}
|
||||
- {get_param: GnocchiRbdPoolName}
|
||||
# CinderRbdExtraPools is a list (do not indent further)
|
||||
- {get_param: CinderRbdExtraPools}
|
||||
- {get_param: CephPools}
|
||||
yaql:
|
||||
expression: $.data.toDict($.get('name')).values()
|
||||
data:
|
||||
list_concat_unique:
|
||||
- repeat:
|
||||
template:
|
||||
name: <%pool%>
|
||||
pg_num: {get_param: CephPoolDefaultPgNum}
|
||||
rule_name: ""
|
||||
for_each:
|
||||
<%pool%>:
|
||||
list_concat_unique:
|
||||
- - {get_param: CinderRbdPoolName}
|
||||
- {get_param: CinderBackupRbdPoolName}
|
||||
- {get_param: NovaRbdPoolName}
|
||||
- {get_param: GlanceRbdPoolName}
|
||||
- {get_param: GnocchiRbdPoolName}
|
||||
# CinderRbdExtraPools is a list (do not indent further)
|
||||
- {get_param: CinderRbdExtraPools}
|
||||
- {get_param: CephPools}
|
||||
openstack_keys: &openstack_keys
|
||||
- name:
|
||||
list_join:
|
||||
|
Loading…
x
Reference in New Issue
Block a user