]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
ceph-defaults: remove backwards compat for containerized_deployment
authorAndrew Schoen <aschoen@redhat.com>
Tue, 8 May 2018 14:26:07 +0000 (09:26 -0500)
committerGuillaume Abrioux <gabrioux@redhat.com>
Fri, 18 May 2018 15:58:24 +0000 (17:58 +0200)
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 <aschoen@redhat.com>
roles/ceph-defaults/defaults/main.yml

index 896e1ff5d7617e4f1afbb5c8432d3e424f0940e2..9e780f86907c473ebbae2774fbe2c35c9ed9ecf4 100644 (file)
@@ -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 #