diff options
| author |   Zuul <zuul@review.openstack.org> | 2017-11-03 02:53:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-11-03 02:53:24 +0000 |
| commit | b1c1a8df15b3271df9b2674ce83c4e322856ffeb (patch) | |
| tree | 2abd323547b394022d057b6e1dbaeafa71c88de3 /docker | |
| parent | 7bfae61023d34043d8fe9523f88febac6e7597be (diff) | |
| parent | f0bd09dc2807d1d1edcfd9a3d87c6ba8c70e2267 (diff) | |
Merge "Update CephPools format in the docker templates to fit ceph-ansible" into stable/pike
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/services/ceph-ansible/ceph-base.yaml | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/docker/services/ceph-ansible/ceph-base.yaml b/docker/services/ceph-ansible/ceph-base.yaml index 8cc81fb0..4674ec14 100644 --- a/docker/services/ceph-ansible/ceph-base.yaml +++ b/docker/services/ceph-ansible/ceph-base.yaml @@ -73,15 +73,9 @@ parameters: description: > It can be used to override settings for one of the predefined pools, or to create additional ones. Example: - { - "volumes": { - "size": 5, - "pg_num": 128, - "pgp_num": 128 - } - } - default: {} - type: json + [{"name": "volumes", "pg_num": 64, "rule_name": ""}] + default: [] + type: comma_delimited_list CinderRbdPoolName: default: volumes type: string @@ -225,13 +219,7 @@ outputs: - {get_param: NovaRbdPoolName} - {get_param: GlanceRbdPoolName} - {get_param: GnocchiRbdPoolName} - - repeat: - template: - name: <%pool%> - pg_num: {get_param: CephPoolDefaultPgNum} - rule_name: "" - for_each: - <%pool%>: {get_param: CephPools} + - {get_param: CephPools} openstack_keys: &openstack_keys - name: list_join: |