From 3dfeffab43217a392ac1c489fba27c6bec4678cc Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Mon, 26 Jun 2017 15:28:30 +0200 Subject: [PATCH] Fix followup on refact code (1469) In addition to 7bb04a5, these lines are no longer needed and can even cause playbook failures. Signed-off-by: Guillaume Abrioux --- roles/ceph-docker-common/tasks/main.yml | 1 + roles/ceph-nfs/tasks/docker/main.yml | 3 --- roles/ceph-osd/tasks/docker/main.yml | 3 --- roles/ceph-rbd-mirror/tasks/docker/main.yml | 2 -- roles/ceph-restapi/tasks/docker/main.yml | 1 - roles/ceph-rgw/tasks/docker/main.yml | 2 -- 6 files changed, 1 insertion(+), 11 deletions(-) diff --git a/roles/ceph-docker-common/tasks/main.yml b/roles/ceph-docker-common/tasks/main.yml index d27223fb9..fc86e14fc 100644 --- a/roles/ceph-docker-common/tasks/main.yml +++ b/roles/ceph-docker-common/tasks/main.yml @@ -95,3 +95,4 @@ (inventory_hostname in groups.get('rgws', [])) - include: selinux.yml + when: ansible_os_family == 'RedHat' diff --git a/roles/ceph-nfs/tasks/docker/main.yml b/roles/ceph-nfs/tasks/docker/main.yml index 9a731c46b..30da2f324 100644 --- a/roles/ceph-nfs/tasks/docker/main.yml +++ b/roles/ceph-nfs/tasks/docker/main.yml @@ -2,8 +2,5 @@ # Copy Ceph configs to host - include: copy_configs.yml -- include: selinux.yml - when: ansible_os_family == 'RedHat' - - include: start_docker_nfs.yml diff --git a/roles/ceph-osd/tasks/docker/main.yml b/roles/ceph-osd/tasks/docker/main.yml index d9bff3ee2..db0fad568 100644 --- a/roles/ceph-osd/tasks/docker/main.yml +++ b/roles/ceph-osd/tasks/docker/main.yml @@ -1,5 +1,2 @@ --- -- include: fetch_configs.yml - when: not containerized_deployment_with_kv - - include: start_docker_osd.yml diff --git a/roles/ceph-rbd-mirror/tasks/docker/main.yml b/roles/ceph-rbd-mirror/tasks/docker/main.yml index 84ebe12e0..04ef97017 100644 --- a/roles/ceph-rbd-mirror/tasks/docker/main.yml +++ b/roles/ceph-rbd-mirror/tasks/docker/main.yml @@ -1,4 +1,2 @@ --- -- include: fetch_configs.yml - - include: start_docker_rbd_mirror.yml diff --git a/roles/ceph-restapi/tasks/docker/main.yml b/roles/ceph-restapi/tasks/docker/main.yml index 900cd8d2a..9a09e14a8 100644 --- a/roles/ceph-restapi/tasks/docker/main.yml +++ b/roles/ceph-restapi/tasks/docker/main.yml @@ -1,3 +1,2 @@ --- -- include: fetch_configs.yml - include: start_docker_restapi.yml diff --git a/roles/ceph-rgw/tasks/docker/main.yml b/roles/ceph-rgw/tasks/docker/main.yml index 8a599aef9..71e2c652c 100644 --- a/roles/ceph-rgw/tasks/docker/main.yml +++ b/roles/ceph-rgw/tasks/docker/main.yml @@ -1,6 +1,4 @@ --- -- include: fetch_configs.yml - - include: start_docker_rgw.yml - include: copy_configs.yml