From 75576244c97b88ab140bf0a12a497fe3f1036172 Mon Sep 17 00:00:00 2001 From: David Galloway Date: Thu, 5 Oct 2017 16:13:31 -0400 Subject: [PATCH] testnode: Shuffle tasks around to make sure packages install first I moved lvm.conf in https://github.com/ceph/ceph-cm-ansible/pull/342 because I wanted all the disk management tasks clustered together. I failed to take into account the fact that the lvm2 package might not be installed yet (like on OVH nodes). Signed-off-by: David Galloway --- roles/testnode/tasks/main.yml | 42 +++++++++++++++++------------------ 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/roles/testnode/tasks/main.yml b/roles/testnode/tasks/main.yml index 5f511566..da7163f4 100644 --- a/roles/testnode/tasks/main.yml +++ b/roles/testnode/tasks/main.yml @@ -24,27 +24,6 @@ tags: - hostname -- include: zap_disks.yml - tags: - - zap - -- name: partition drives, if any are requested - include: drive_partitioning.yml - when: drives_to_partition is defined - tags: - - partition - -- name: set up LVM - include: lvm.yml - tags: - - lvm - -- name: mount /var/lib/ceph to specified partition - include: var_lib.yml - when: var_lib_partition is defined - tags: - - varlib - - name: configure ssh include: ssh.yml tags: @@ -88,6 +67,27 @@ include: setup-debian.yml when: ansible_distribution == "Debian" +- include: zap_disks.yml + tags: + - zap + +- name: partition drives, if any are requested + include: drive_partitioning.yml + when: drives_to_partition is defined + tags: + - partition + +- name: set up LVM + include: lvm.yml + tags: + - lvm + +- name: mount /var/lib/ceph to specified partition + include: var_lib.yml + when: var_lib_partition is defined + tags: + - varlib + # Install and configure cpan and Amazon::S3 - include: cpan.yml tags: -- 2.47.3