From 645f61c3516af91eede9c2554080df2be142a860 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Tue, 8 May 2018 09:26:07 -0500 Subject: [PATCH] ceph-defaults: remove backwards compat for containerized_deployment The validation module does not get config options with the template syntax rendered, so we're gonna remove that and just default it to False. The backwards compat was schedule to be removed in 3.1 anyway. Signed-off-by: Andrew Schoen --- roles/ceph-defaults/defaults/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml index 896e1ff5d..9e780f869 100644 --- a/roles/ceph-defaults/defaults/main.yml +++ b/roles/ceph-defaults/defaults/main.yml @@ -503,8 +503,7 @@ mon_containerized_deployment: False # backward compatibility with stable-2.2, wi osd_containerized_deployment: False # backward compatibility with stable-2.2, will disappear in stable 3.1 mds_containerized_deployment: False # backward compatibility with stable-2.2, will disappear in stable 3.1 rgw_containerized_deployment: False # backward compatibility with stable-2.2, will disappear in stable 3.1 -containerized_deployment: "{{ True if mon_containerized_deployment or osd_containerized_deployment or mds_containerized_deployment or rgw_containerized_deployment else False }}" # backward compatibility with stable-2.2, will disappear in stable 3.1 - +containerized_deployment: False ############ # KV store # -- 2.39.5