Set package lists for centos 6 and 7

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

diff --git a/roles/testnode/vars/centos_6.yml b/roles/testnode/vars/centos_6.yml
index cbf056aceb1e26999d6db104912dae999242e700..526d1970ab7c01bd1f1c69c06fe2a5a028ec2ba0 100644 (file)
--- a/roles/testnode/vars/centos_6.yml
+++ b/roles/testnode/vars/centos_6.yml
@@ -50,12 +50,12 @@ packages:
   - sysstat
   - gdb
   - python-configobj
+  # for running ceph
   - libedit
   - openssl098e
   - gperftools-devel
   - boost-thread
   - xfsprogs
-  - xfsprogs-devel
   - gdisk
   - parted
   - libgcrypt
@@ -63,44 +63,79 @@ packages:
   - cryptopp
   - fuse
   - fuse-libs
+  ###
+  # for ceph-deploy
+  - python-virtualenv
+  ###
+  # for setting BIOS settings
+  - smbios-utils
+  ###
   - openssl
   - libuuid
   - btrfs-progs
+  # for compiling helpers
+  - libatomic_ops-devel
+  ###
+  # used by workunits
+  - git-all
   - attr
   - valgrind
   - python-nose
-  - mpich
+  - mpich2
+  - mpich2-devel
   - ant
   - dbench
+  - bonnie++
   - fuse-sshfs
-  - lsof
+  - fsstress
   - iozone
+  ###
+  # used by the xfstests tasks
   - libtool
   - automake
   - gettext
-  - libuuid-devel
+  - uuid-devel
   - libacl-devel
   - bc
   - xfsdump
+  ###
+  # for blktrace and seekwatcher
   - blktrace
   - numpy
   - python-matplotlib
+  ###
+  # for qemu
   - usbredir
   - genisoimage
-  - qemu-img-rhev-1.5.3-60_ceph.el7.5
-  - qemu-kvm-rhev-1.5.3-60_ceph.el7.5
-  - qemu-kvm-tools-rhev-1.5.3-60_ceph.el7.5
+  - qemu-img-0.12.1.2-2.415.el6.3ceph
+  - qemu-kvm-0.12.1.2-2.415.el6.3ceph
+  - qemu-kvm-tools-0.12.1.2-2.415.el6.3ceph
+  - qemu-guest-agent-0.12.1.2-2.415.el6.3ceph
+  ###
+  # for apache and rgw
   - httpd
   - httpd-devel
   - httpd-tools
   - mod_ssl
-  - mod_fastcgi-2.4.7-1.ceph.el7
+  - mod_fastcgi-2.4.7-1.ceph.el6
+  ###
   - libevent-devel
-  - perl-JSON-XS
+  - python-devel
+  # for json_xs to investigate JSON by hand
+  - perl-JSON
+  # for pretty-printing xml
   - perl-XML-Twig
-  - java-1.6.0-openjdk-devel
+  # for java bindings, hadoop, etc.
+  - java-1.7.0-openjdk-devel
   - junit4
+  ###
+  # tgt & open-iscsi
+  # installing these 2 packages makes this playbook
+  # not idempotent on rhel 6.x and centos 6.x
+  # see: http://tracker.ceph.com/issues/11216
   - scsi-target-utils
   - iscsi-initiator-utils
+  # for disk/etc monitoring
   - smartmontools
+  # for nfs
   - nfs-utils

diff --git a/roles/testnode/vars/centos_7.yml b/roles/testnode/vars/centos_7.yml
index eaa8ea470810f5a023b8478c7c141bd39a754d6d..31bb9bee3b51a1fe6f492fc7f441b77314c5ba16 100644 (file)
--- a/roles/testnode/vars/centos_7.yml
+++ b/roles/testnode/vars/centos_7.yml
@@ -26,12 +26,12 @@ packages:
   - sysstat
   - gdb
   - python-configobj
+  # for running ceph
   - libedit
   - openssl098e
   - gperftools-devel
   - boost-thread
   - xfsprogs
-  - xfsprogs-devel
   - gdisk
   - parted
   - libgcrypt
@@ -39,18 +39,23 @@ packages:
   - cryptopp
   - fuse
   - fuse-libs
+  ###
+  # for ceph-deploy
+  - python-virtualenv
+  ###
   - openssl
   - libuuid
   - btrfs-progs
+  # used by workunits
   - attr
   - valgrind
   - python-nose
-  - mpich
+  - mpich2
   - ant
-  - dbench
   - fuse-sshfs
-  - lsof
   - iozone
+  ###
+  # used by the xfstests tasks
   - libtool
   - automake
   - gettext
@@ -58,25 +63,42 @@ packages:
   - libacl-devel
   - bc
   - xfsdump
+  ###
+  # for blktrace and seekwatcher
   - blktrace
   - numpy
   - python-matplotlib
+  ###
+  # for qemu
   - usbredir
   - genisoimage
-  - qemu-img-rhev-1.5.3-60_ceph.el7.5
-  - qemu-kvm-rhev-1.5.3-60_ceph.el7.5
-  - qemu-kvm-tools-rhev-1.5.3-60_ceph.el7.5
+  - qemu-img-rhev-1.5.3-60_ceph.el7.centos.5
+  - qemu-kvm-rhev-1.5.3-60_ceph.el7.centos.5
+  - qemu-kvm-tools-rhev-1.5.3-60_ceph.el7.centos.5
+  ###
+  # for apache and rgw
   - httpd
   - httpd-devel
   - httpd-tools
   - mod_ssl
-  - mod_fastcgi-2.4.7-1.ceph.el7
+  - mod_fastcgi-2.4.7-1.ceph.el7.centos
+  ###
   - libevent-devel
+  # for json_xs to investigate JSON by hand
   - perl-JSON-XS
+  # for pretty-printing xml
   - perl-XML-Twig
+  # for java bindings, hadoop, etc.
   - java-1.6.0-openjdk-devel
   - junit4
+  ###
+  # tgt & open-iscsi
+  # installing these 2 packages makes this playbook
+  # not idempotent on rhel 6.x
+  # see: http://tracker.ceph.com/issues/11216
   - scsi-target-utils
   - iscsi-initiator-utils
+  # for disk/etc monitoring
   - smartmontools
+  # for nfs
   - nfs-utils

diff --git a/roles/testnode/vars/redhat_6.yml b/roles/testnode/vars/redhat_6.yml
index 95896ee4e072f904c4c71f299e309962ee321c30..4e9ed895c6090b953043e003e9ed81f1d3a29a6d 100644 (file)
--- a/roles/testnode/vars/redhat_6.yml
+++ b/roles/testnode/vars/redhat_6.yml
@@ -129,7 +129,7 @@ packages:
   ###
   # tgt & open-iscsi
   # installing these 2 packages makes this playbook
-  # not idempotent on rhel 6.x
+  # not idempotent on rhel 6.x and centos 6.x
   # see: http://tracker.ceph.com/issues/11216
   - scsi-target-utils
   - iscsi-initiator-utils