openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Make CephPools override properties of other pools"

This commit is contained in:
Zuul 2017-12-07 15:08:38 +00:00 committed by Gerrit Code Review
parent ce00019000 9207b00ace
commit d7c03dfafc
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -218,23 +218,26 @@ outputs:
ceph_origin: distro ceph_origin: distro
openstack_config: true openstack_config: true
openstack_pools: openstack_pools:
list_concat_unique: yaql:
- repeat: expression: $.data.toDict($.get('name')).values()
template: data:
name: <%pool%> list_concat_unique:
pg_num: {get_param: CephPoolDefaultPgNum} - repeat:
rule_name: "" template:
for_each: name: <%pool%>
<%pool%>: pg_num: {get_param: CephPoolDefaultPgNum}
list_concat_unique: rule_name: ""
- - {get_param: CinderRbdPoolName} for_each:
- {get_param: CinderBackupRbdPoolName} <%pool%>:
- {get_param: NovaRbdPoolName} list_concat_unique:
- {get_param: GlanceRbdPoolName} - - {get_param: CinderRbdPoolName}
- {get_param: GnocchiRbdPoolName} - {get_param: CinderBackupRbdPoolName}
# CinderRbdExtraPools is a list (do not indent further) - {get_param: NovaRbdPoolName}
- {get_param: CinderRbdExtraPools} - {get_param: GlanceRbdPoolName}
- {get_param: CephPools} - {get_param: GnocchiRbdPoolName}
# CinderRbdExtraPools is a list (do not indent further)
- {get_param: CinderRbdExtraPools}
- {get_param: CephPools}
openstack_keys: &openstack_keys openstack_keys: &openstack_keys
- name: - name:
list_join: list_join: