openstack/tripleo-heat-templates
Code Issues Proposed changes

Make CephConfigOverrides append to ceph.conf[global]

Browse Source 
Previously it was mistakenly replacing the contents because we
do not do deep merge.

Change-Id: I145feb0208f135da7c71694ebcecd937244d66b1
Closes-Bug: #1719919
This commit is contained in:
Giulio Fidente 2017-09-27 16:39:19 +02:00
parent b6b2887cf8
commit 17416dcfc5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/services/ceph-ansible/ceph-base.yaml
View File

@ -272,9 +272,9 @@ outputs:
keys: *openstack_keys keys: *openstack_keys
pools: [] pools: []
ceph_conf_overrides: ceph_conf_overrides:
map_merge: global:
- global: map_merge:
osd_pool_default_size: {get_param: CephPoolDefaultSize} - osd_pool_default_size: {get_param: CephPoolDefaultSize}
osd_pool_default_pg_num: {get_param: CephPoolDefaultPgNum} osd_pool_default_pg_num: {get_param: CephPoolDefaultPgNum}
osd_pool_default_pgp_num: {get_param: CephPoolDefaultPgNum} osd_pool_default_pgp_num: {get_param: CephPoolDefaultPgNum}
rgw_keystone_api_version: 3 rgw_keystone_api_version: 3
@ -285,7 +285,7 @@ outputs:
rgw_keystone_admin_user: swift rgw_keystone_admin_user: swift
rgw_keystone_admin_password: {get_param: SwiftPassword} rgw_keystone_admin_password: {get_param: SwiftPassword}
rgw_s3_auth_use_keystone: 'true' rgw_s3_auth_use_keystone: 'true'
- {get_param: CephConfigOverrides} - {get_param: CephConfigOverrides}
ntp_service_enabled: false ntp_service_enabled: false
generate_fsid: false generate_fsid: false
ip_version: ip_version: