From 6947f9c3ea04ab0582d3900728cc52819f4d6b5b Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Fri, 19 Oct 2018 16:06:44 +0200 Subject: [PATCH] docker-common: remove dirs_permissions.yml this is already done in `ceph-config` role. Let's remove this duplicated task. Signed-off-by: Guillaume Abrioux --- .../ceph-docker-common/tasks/dirs_permissions.yml | 14 -------------- roles/ceph-docker-common/tasks/main.yml | 7 +------ 2 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 roles/ceph-docker-common/tasks/dirs_permissions.yml diff --git a/roles/ceph-docker-common/tasks/dirs_permissions.yml b/roles/ceph-docker-common/tasks/dirs_permissions.yml deleted file mode 100644 index e15dea958..000000000 --- a/roles/ceph-docker-common/tasks/dirs_permissions.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- name: create bootstrap directories - file: - path: "{{ item }}" - state: directory - owner: "{{ bootstrap_dirs_owner }}" - group: "{{ bootstrap_dirs_group }}" - mode: "0755" - with_items: - - "{{ ceph_conf_key_directory }}" - - /var/lib/ceph/bootstrap-osd - - /var/lib/ceph/bootstrap-mds - - /var/lib/ceph/bootstrap-rgw - - /var/lib/ceph/bootstrap-rbd diff --git a/roles/ceph-docker-common/tasks/main.yml b/roles/ceph-docker-common/tasks/main.yml index 093d56d6d..b4ab1eb8e 100644 --- a/roles/ceph-docker-common/tasks/main.yml +++ b/roles/ceph-docker-common/tasks/main.yml @@ -49,9 +49,4 @@ ceph_version: "{{ ceph_version.stdout.split(' ')[2] }}" - name: include release.yml - include_tasks: release.yml - -# NOTE (jimcurtis): dirs_permissions.yml must precede fetch_configs.yml -# # because it creates the directories needed by the latter. -- name: include dirs_permissions.yml - include_tasks: dirs_permissions.yml + include_tasks: release.yml \ No newline at end of file