openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Make CephConfigOverrides append to ceph.conf[global]"

This commit is contained in:
Jenkins 2017-09-27 21:08:23 +00:00 committed by Gerrit Code Review
parent 30ffd14b21 17416dcfc5
commit bf9252ae33
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
pools: []
ceph_conf_overrides:
map_merge:
- global:
osd_pool_default_size: {get_param: CephPoolDefaultSize}
global:
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
@ -285,7 +285,7 @@ outputs:
rgw_keystone_admin_user: swift
rgw_keystone_admin_password: {get_param: SwiftPassword}
rgw_s3_auth_use_keystone: 'true'
- {get_param: CephConfigOverrides}
- {get_param: CephConfigOverrides}
ntp_service_enabled: false
generate_fsid: false
ip_version: