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 fd27a81718ab5ff9a8483a9f9150307e114de942..cd8ce143f493fe51ce7876a5f85192446ad61d15 100644 (file)
--- 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 314873ffded7c3e866f9b0464eff8a62c4ae3fb0..6c0f118d59f90402ddd0c29fc47abc92abd4d111 100644 (file)
--- 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 e41c5f58419e1a8e9902bd9beb3e1e2da28b02a2..c32e65f68f6707e5c113f6895bbd3c79d4d37a27 100644 (file)
--- 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 a96bd789bdb81486329c9de1ef95f8957bc8fc55..a47e0b7eaabf57bbf11e5edf8d52bdd6dcc237a8 100644 (file)
--- 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 70c13eac183a611d99dac2a79b7c4236674eb5dd..d4e4e06ef421b11993334dbae6c4e1e4a24189af 100644 (file)
--- 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