Merge "Make CephPools override properties of other pools"

docker/services/ceph-ansible/ceph-base.yaml

@@ -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: