From 07dc724ac32b1df9a36cfddeca0f190c7c441669 Mon Sep 17 00:00:00 2001
From: Giulio Fidente <gfidente@redhat.com>
Date: Tue, 21 Nov 2017 15:58:33 +0100
Subject: [PATCH] Make CephPools type json instead of list

The json type should also allow for list objects.

Closes-Bug: 1733875
Change-Id: Ifd3816c489018c59b44445581c65b36cc56ba40a
---
 docker/services/ceph-ansible/ceph-base.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/services/ceph-ansible/ceph-base.yaml b/docker/services/ceph-ansible/ceph-base.yaml
index b7b2b40999..a3f4b0ed95 100644
--- a/docker/services/ceph-ansible/ceph-base.yaml
+++ b/docker/services/ceph-ansible/ceph-base.yaml
@@ -75,7 +75,7 @@ parameters:
       additional ones. Example:
       [{"name": "volumes", "pg_num": 64, "rule_name": ""}]
     default: []
-    type: comma_delimited_list
+    type: json
   CinderRbdPoolName:
     default: volumes
     type: string
@@ -218,7 +218,7 @@ outputs:
           ceph_origin: distro
           openstack_config: true
           openstack_pools:
-            list_concat:
+            list_concat_unique:
               - repeat:
                   template:
                     name: <%pool%>
@@ -226,7 +226,7 @@ outputs:
                     rule_name: ""
                   for_each:
                     <%pool%>:
-                      list_concat:
+                      list_concat_unique:
                         - - {get_param: CinderRbdPoolName}
                           - {get_param: CinderBackupRbdPoolName}
                           - {get_param: NovaRbdPoolName}