From: Ilya Dryomov <idryomov@gmail.com>
Date: Mon, 21 Aug 2017 13:14:46 +0000 (+0200)
Subject: testnode: edit lvm.conf on both ubuntu and centos
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F329%2Fhead;p=ceph-cm-ansible.git

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
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