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 <idryomov@gmail.com>

diff --git a/roles/testnode/tasks/lvm.yml b/roles/testnode/tasks/lvm.yml
new file mode 100644 (file)
index 0000000..e007a36
--- /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 b060ed45bb55978c44e14a201d40b35d62b35d9d..6fd147a6d99fc4f8234bfe7d00649fac7ef0752b 100644 (file)
--- 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 7e47a1aad8a8a059a973dafaa03c39aa4bec4454..9c01ec14ef4698e28159302cfebf4480783d8218 100644 (file)
--- 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