From f07717e345f17d970a46a5b975cdf3134e7e7eb4 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Mon, 21 Aug 2017 15:14:46 +0200 Subject: [PATCH] testnode: edit lvm.conf on both ubuntu and centos This modification is needed for krbd xfstests (e.g. generic/081), so factor out lvm.conf snippet from setup-ubuntu.yml into tasks/. Signed-off-by: Ilya Dryomov --- roles/testnode/tasks/lvm.yml | 8 ++++++++ roles/testnode/tasks/main.yml | 4 ++++ roles/testnode/tasks/setup-ubuntu.yml | 8 -------- 3 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 roles/testnode/tasks/lvm.yml diff --git a/roles/testnode/tasks/lvm.yml b/roles/testnode/tasks/lvm.yml new file mode 100644 index 00000000..e007a36c --- /dev/null +++ b/roles/testnode/tasks/lvm.yml @@ -0,0 +1,8 @@ +--- +- name: Edit lvm.conf to support LVM on kRBD. + lineinfile: + dest: /etc/lvm/lvm.conf + regexp: "# types =" + line: 'types = [ "rbd", 16 ]' + backrefs: yes + state: present diff --git a/roles/testnode/tasks/main.yml b/roles/testnode/tasks/main.yml index b060ed45..6fd147a6 100644 --- a/roles/testnode/tasks/main.yml +++ b/roles/testnode/tasks/main.yml @@ -82,6 +82,10 @@ tags: - cpan +- include: lvm.yml + tags: + - lvm + # configure ntp - include: ntp.yml tags: diff --git a/roles/testnode/tasks/setup-ubuntu.yml b/roles/testnode/tasks/setup-ubuntu.yml index 7e47a1aa..9c01ec14 100644 --- a/roles/testnode/tasks/setup-ubuntu.yml +++ b/roles/testnode/tasks/setup-ubuntu.yml @@ -7,11 +7,3 @@ - include: nfs.yml tags: - nfs - -- name: Edit lvm.conf to support LVM on RBD. - lineinfile: - dest: /etc/lvm/lvm.conf - regexp: "# types =" - line: 'types = [ "rbd", 16 ]' - backrefs: yes - state: present -- 2.47.3