From 98b994e77a9c884383438f38864064a963cc84f7 Mon Sep 17 00:00:00 2001 From: Francesco Pantano Date: Tue, 13 Oct 2020 15:29:25 +0200 Subject: [PATCH] Add ceph_client default options to ceph.conf This change allows 'ceph_client_config_overrides' to be part of the main 'ceph_overrides' dict that represents the list of options wanted in the ceph.conf. These options are defined in tripleo-heat-templates and set as facts for tripleo-ansible. Change-Id: Ia12466623322e2a6149cd98a90a6ce3e4e4a52e4 --- .../tripleo_ceph_work_dir/tasks/build_config_overrides.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tripleo_ansible/roles/tripleo_ceph_work_dir/tasks/build_config_overrides.yml b/tripleo_ansible/roles/tripleo_ceph_work_dir/tasks/build_config_overrides.yml index e12ad4d3c..381b6d950 100644 --- a/tripleo_ansible/roles/tripleo_ceph_work_dir/tasks/build_config_overrides.yml +++ b/tripleo_ansible/roles/tripleo_ceph_work_dir/tasks/build_config_overrides.yml @@ -40,4 +40,5 @@ - name: build ceph config overrides set_fact: ceph_overrides: "{'ceph_conf_overrides': {{ ceph_default_overrides|default({}) |combine(config_overrides|default({}), recursive=True) - |combine(ceph_rgw_config_overrides|default({}), recursive=True)|combine(ceph_orphan|default({}), recursive=True)}} }" + |combine(ceph_rgw_config_overrides|default({}), recursive=True)|combine(ceph_orphan|default({}), recursive=True) + |combine(ceph_client_config_overrides|default({}),recursive=True)}} }"