From: Sébastien Han Date: Tue, 7 Aug 2018 12:15:23 +0000 (+0200) Subject: rgw: remove useless condition X-Git-Tag: v3.1.0rc16 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=651058bd1b8fbc65b2061e590d0ef626a1a12e91;p=ceph-ansible.git rgw: remove useless condition The include does not need a condition on containerized_deployment since we are already in an include than has the same condition. Signed-off-by: Sébastien Han (cherry picked from commit 5a89479abe759844eb59bac190105d9ba34ed0b1) --- diff --git a/roles/ceph-rgw/tasks/docker/main.yml b/roles/ceph-rgw/tasks/docker/main.yml index 6a33851f1..0928e5739 100644 --- a/roles/ceph-rgw/tasks/docker/main.yml +++ b/roles/ceph-rgw/tasks/docker/main.yml @@ -1,11 +1,3 @@ --- -<<<<<<< HEAD -- name: include container_env_facts.yml - include: container_env_facts.yml - when: - - containerized_deployment - -======= ->>>>>>> 4d64dd46... rgw: ability to use ceph-ansible vars into containers - name: include start_docker_rgw.yml include: start_docker_rgw.yml