From: Andrew Schoen <aschoen@redhat.com>
Date: Fri, 17 Apr 2015 21:12:22 +0000 (-0500)
Subject: RBD: add support for xfstests and required prerequisites.
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bc5452fd07a1a3ca92f093c20c6a62a5d87fa021;p=ceph-cm-ansible.git

RBD: add support for xfstests and required prerequisites.

This is a port of:

https://github.com/ceph/ceph-qa-chef/pull/12/files

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
---

diff --git a/roles/testnode/defaults/main.yml b/roles/testnode/defaults/main.yml
index fd27a817..cd8ce143 100644
--- a/roles/testnode/defaults/main.yml
+++ b/roles/testnode/defaults/main.yml
@@ -20,3 +20,4 @@ packages_to_upgrade: []
 
 # the user teuthology will use
 teuthology_user: "ubuntu"
+xfstests_user: "fsgqa"
diff --git a/roles/testnode/tasks/setup-ubuntu.yml b/roles/testnode/tasks/setup-ubuntu.yml
index 314873ff..6c0f118d 100644
--- a/roles/testnode/tasks/setup-ubuntu.yml
+++ b/roles/testnode/tasks/setup-ubuntu.yml
@@ -133,3 +133,11 @@
     - resolvconf/base
   notify:
     - restart resolvdns
+
+- name: Edit lvm.conf to support LVM on RBD.
+  lineinfile:
+    dest: /etc/lvm/lvm.conf
+    regexp: "# types ="
+    line: 'types = [ "rbd", 1024 ]'
+    backrefs: yes
+    state: present
diff --git a/roles/testnode/tasks/user.yml b/roles/testnode/tasks/user.yml
index e41c5f58..c32e65f6 100644
--- a/roles/testnode/tasks/user.yml
+++ b/roles/testnode/tasks/user.yml
@@ -12,3 +12,9 @@
     uid: 1000
     group: sudo
     state: present
+
+- name: Add a user for xfstests to test user quotas.
+  user:
+    name: "{{ xfstests_user }}"
+    uid: 10101
+    state: present
diff --git a/roles/testnode/vars/redhat_7.yml b/roles/testnode/vars/redhat_7.yml
index a96bd789..a47e0b7e 100644
--- a/roles/testnode/vars/redhat_7.yml
+++ b/roles/testnode/vars/redhat_7.yml
@@ -80,5 +80,7 @@ packages:
   - iscsi-initiator-utils
   - smartmontools
   - nfs-utils
+  # for xfstests
+  - ncurses-devel
 
 nfs_service: nfs-server
diff --git a/roles/testnode/vars/ubuntu.yml b/roles/testnode/vars/ubuntu.yml
index 70c13eac..d4e4e06e 100644
--- a/roles/testnode/vars/ubuntu.yml
+++ b/roles/testnode/vars/ubuntu.yml
@@ -63,6 +63,10 @@ common_packages:
   - dmapi
   - xfslibs-dev
   - libattr1-dev
+  - quota
+  - libcap2-bin
+  - libncurses5-dev
+  - lvm2
   ###
   - sysprof
   - vim