diff options
| author |   Giulio Fidente <gfidente@redhat.com> | 2017-09-27 16:39:19 +0200 |
|---|---|---|
| committer | Giulio Fidente <gfidente@redhat.com> | 2017-09-28 07:54:38 +0200 |
| commit | f2d8fa73f6cec2e3d754dbd9a9973918cc9832d0 (patch) | |
| tree | ac229217188547d4defa986310e6cc2907e172df /docker/services | |
| parent | f808c7e114e27cbaf083c7acb6ba930272f8591e (diff) | |
Make CephConfigOverrides append to ceph.conf[global]
Previously it was mistakenly replacing the contents because we
do not do deep merge.
Change-Id: I145feb0208f135da7c71694ebcecd937244d66b1
Closes-Bug: #1719919
(cherry picked from commit 17416dcfc56c5148ccc9ab40297f99adfdcd085b)
Diffstat (limited to 'docker/services')
| -rw-r--r-- | docker/services/ceph-ansible/ceph-base.yaml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/services/ceph-ansible/ceph-base.yaml b/docker/services/ceph-ansible/ceph-base.yaml index b60f98c2..8cc81fb0 100644 --- a/docker/services/ceph-ansible/ceph-base.yaml +++ b/docker/services/ceph-ansible/ceph-base.yaml @@ -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: |