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 <seb@redhat.com>
(cherry picked from commit 5a89479abe759844eb59bac190105d9ba34ed0b1)

diff --git a/roles/ceph-rgw/tasks/docker/main.yml b/roles/ceph-rgw/tasks/docker/main.yml
index 6a33851f103abafcb6072fed28a3f9b7b7def80f..0928e5739ff221a26e7471d518bfb8a6c135061e 100644 (file)
--- 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