7 files changed, 27 insertions, 18 deletions

diff --git a/docker/services/ceph-ansible/ceph-base.yaml b/docker/services/ceph-ansible/ceph-base.yaml
index 18d3e6a3..8cc81fb0 100644
--- a/docker/services/ceph-ansible/ceph-base.yaml
+++ b/docker/services/ceph-ansible/ceph-base.yaml
@@ -58,13 +58,17 @@ 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
@@ -178,7 +182,7 @@ outputs:
         config_volume: ''
         step_config: ''
       docker_config: {}
-      service_workflow_tasks:
+      workflow_tasks:
         step2:
           - name: ceph_base_ansible_workflow
             workflow: { get_param: CephAnsibleWorkflowName }
@@ -269,16 +273,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:
diff --git a/docker/services/ceph-ansible/ceph-client.yaml b/docker/services/ceph-ansible/ceph-client.yaml
index 55d8d9da..0b782941 100644
--- a/docker/services/ceph-ansible/ceph-client.yaml
+++ b/docker/services/ceph-ansible/ceph-client.yaml
@@ -54,5 +54,5 @@ outputs:
         config_volume: ''
         step_config: ''
       docker_config: {}
-      service_workflow_tasks: {get_attr: [CephBase, role_data, service_workflow_tasks]}
+      workflow_tasks: {get_attr: [CephBase, role_data, workflow_tasks]}
       config_settings: {}
diff --git a/docker/services/ceph-ansible/ceph-external.yaml b/docker/services/ceph-ansible/ceph-external.yaml
index f93dd566..bb2fc20a 100644
--- a/docker/services/ceph-ansible/ceph-external.yaml
+++ b/docker/services/ceph-ansible/ceph-external.yaml
@@ -58,7 +58,7 @@ outputs:
         config_volume: ''
         step_config: ''
       docker_config: {}
-      service_workflow_tasks: {get_attr: [CephBase, role_data, service_workflow_tasks]}
+      workflow_tasks: {get_attr: [CephBase, role_data, workflow_tasks]}
       config_settings:
         ceph_client_ansible_vars:
           map_merge:
diff --git a/docker/services/ceph-ansible/ceph-mds.yaml b/docker/services/ceph-ansible/ceph-mds.yaml
index 4ef3a669..abdb3c3f 100644
--- a/docker/services/ceph-ansible/ceph-mds.yaml
+++ b/docker/services/ceph-ansible/ceph-mds.yaml
@@ -68,7 +68,7 @@ outputs:
         config_volume: ''
         step_config: ''
       docker_config: {}
-      service_workflow_tasks: {get_attr: [CephBase, role_data, service_workflow_tasks]}
+      workflow_tasks: {get_attr: [CephBase, role_data, workflow_tasks]}
       config_settings:
         map_merge:
         - tripleo.ceph_mds.firewall_rules:
diff --git a/docker/services/ceph-ansible/ceph-mon.yaml b/docker/services/ceph-ansible/ceph-mon.yaml
index 90149d1e..45f939c2 100644
--- a/docker/services/ceph-ansible/ceph-mon.yaml
+++ b/docker/services/ceph-ansible/ceph-mon.yaml
@@ -71,7 +71,7 @@ outputs:
         config_volume: ''
         step_config: ''
       docker_config: {}
-      service_workflow_tasks: {get_attr: [CephBase, role_data, service_workflow_tasks]}
+      workflow_tasks: {get_attr: [CephBase, role_data, workflow_tasks]}
       config_settings:
         map_merge:
         - tripleo.ceph_mon.firewall_rules:
diff --git a/docker/services/ceph-ansible/ceph-osd.yaml b/docker/services/ceph-ansible/ceph-osd.yaml
index 6e0f4a60..a441f5c9 100644
--- a/docker/services/ceph-ansible/ceph-osd.yaml
+++ b/docker/services/ceph-ansible/ceph-osd.yaml
@@ -38,6 +38,7 @@ parameters:
       - /dev/vdb
       journal_size: 512
       journal_collocation: true
+      osd_scenario: collocated
 
 resources:
   CephBase:
@@ -62,7 +63,7 @@ outputs:
         config_volume: ''
         step_config: ''
       docker_config: {}
-      service_workflow_tasks: {get_attr: [CephBase, role_data, service_workflow_tasks]}
+      workflow_tasks: {get_attr: [CephBase, role_data, workflow_tasks]}
       config_settings:
         map_merge:
         - tripleo.ceph_osd.firewall_rules:
@@ -72,4 +73,5 @@ outputs:
         - ceph_osd_ansible_vars:
             map_merge:
             - {get_attr: [CephBase, role_data, config_settings, ceph_common_ansible_vars]}
+            - osd_objectstore: filestore
             - {get_param: CephAnsibleDisksConfig}
\ No newline at end of file
diff --git a/docker/services/ceph-ansible/ceph-rgw.yaml b/docker/services/ceph-ansible/ceph-rgw.yaml
index 4bed9b46..4479fdbf 100644
--- a/docker/services/ceph-ansible/ceph-rgw.yaml
+++ b/docker/services/ceph-ansible/ceph-rgw.yaml
@@ -62,7 +62,7 @@ outputs:
         config_volume: ''
         step_config: ''
       docker_config: {}
-      service_workflow_tasks: {get_attr: [CephBase, role_data, service_workflow_tasks]}
+      workflow_tasks: {get_attr: [CephBase, role_data, workflow_tasks]}
       config_settings:
         map_merge:
         - tripleo.ceph_rgw.firewall_rules: