summaryrefslogtreecommitdiffstats
path: root/docker/services/ceph-ansible
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2017-10-02 14:10:53 +0200
committerGiulio Fidente <gfidente@redhat.com>2017-10-30 09:59:42 +0100
commitf0bd09dc2807d1d1edcfd9a3d87c6ba8c70e2267 (patch)
tree5a7b4f2d33a26daa628b24ec1ce54f0518450ecd /docker/services/ceph-ansible
parent9dfec11795703b43991e06ef880b52cd0b3a5eb4 (diff)
Update CephPools format in the docker templates to fit ceph-ansible
The format which ceph-ansible uses to describe the list of pools to be created in the cluster is different from the one which puppet-ceph uses; this commit updates the description and the the docker templates accordingly. Change-Id: I1e5b2c3cbf6ae02c19a2275ca119fed6e173319d Closes-Bug: #1720373 (cherry picked from commit c10aa7a0439fb7d8e8e964e75d73f3cbb54aa9ec)
Diffstat (limited to 'docker/services/ceph-ansible')
-rw-r--r--docker/services/ceph-ansible/ceph-base.yaml20
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: