Update CephPools format in the docker templates to fit ceph-ansible

[apex-tripleo-heat-templates.git] / docker / services / ceph-ansible / ceph-base.yaml

diff --git a/docker/services/ceph-ansible/ceph-base.yaml b/docker/services/ceph-ansible/ceph-base.yaml
index 18d3e6a..4674ec1 100644 (file)
--- a/docker/services/ceph-ansible/ceph-base.yaml
+++ b/docker/services/ceph-ansible/ceph-base.yaml
@@ -58,26 +58,24 @@ parameters:
     type: string
     description: List of ceph-ansible tags to skip
     default: 'package-install,with_pkg'
+  CephConfigOverrides:
+    type: json
+    description: Extra config settings to dump into ceph.conf
+    default: {}
   CephClusterFSID:
     type: string
     description: The Ceph cluster FSID. Must be a UUID.
   CephPoolDefaultPgNum:
     description: default pg_num to use for the RBD pools
     type: number
-    default: 32
+    default: 128
   CephPools:
     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
@@ -178,7 +176,7 @@ outputs:
         config_volume: ''
         step_config: ''
       docker_config: {}
-      service_workflow_tasks:
+      workflow_tasks:
         step2:
           - name: ceph_base_ansible_workflow
             workflow: { get_param: CephAnsibleWorkflowName }
@@ -221,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:
@@ -269,16 +261,19 @@ outputs:
           pools: []
           ceph_conf_overrides:
             global:
-              osd_pool_default_size: {get_param: CephPoolDefaultSize}
-              osd_pool_default_pg_num: {get_param: CephPoolDefaultPgNum}
-              rgw_keystone_api_version: 3
-              rgw_keystone_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
-              rgw_keystone_accepted_roles: 'Member, _member_, admin'
-              rgw_keystone_admin_domain: default
-              rgw_keystone_admin_project: service
-              rgw_keystone_admin_user: swift
-              rgw_keystone_admin_password: {get_param: SwiftPassword}
-              rgw_s3_auth_use_keystone: 'true'
+              map_merge:
+                - osd_pool_default_size: {get_param: CephPoolDefaultSize}
+                  osd_pool_default_pg_num: {get_param: CephPoolDefaultPgNum}
+                  osd_pool_default_pgp_num: {get_param: CephPoolDefaultPgNum}
+                  rgw_keystone_api_version: 3
+                  rgw_keystone_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
+                  rgw_keystone_accepted_roles: 'Member, _member_, admin'
+                  rgw_keystone_admin_domain: default
+                  rgw_keystone_admin_project: service
+                  rgw_keystone_admin_user: swift
+                  rgw_keystone_admin_password: {get_param: SwiftPassword}
+                  rgw_s3_auth_use_keystone: 'true'
+                - {get_param: CephConfigOverrides}
           ntp_service_enabled: false
           generate_fsid: false
           ip_version: