From: Andrew Schoen <aschoen@redhat.com>
Date: Tue, 14 Apr 2015 15:44:53 +0000 (-0500)
Subject: Add packages for precise; move common packages to vars/ubuntu.yml.
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5c37e2e676bf5f0df9baf3e4647568a06e165b03;p=ceph-cm-ansible.git

Add packages for precise; move common packages to vars/ubuntu.yml.

This allows precise and trusty to share a list of packages that are
common to both of them.

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

diff --git a/roles/testnode/tasks/apt/packages.yml b/roles/testnode/tasks/apt/packages.yml
index 5af6b26..80a1986 100644
--- a/roles/testnode/tasks/apt/packages.yml
+++ b/roles/testnode/tasks/apt/packages.yml
@@ -18,5 +18,6 @@
   apt:
     name: "{{ item }}"
     state: present 
-  with_items: packages
-  when: packages|length > 0
+  with_items: packages|list + common_packages|list
+  when: packages|length > 0 or
+        common_packages|length > 0
diff --git a/roles/testnode/vars/ubuntu.yml b/roles/testnode/vars/ubuntu.yml
index c125e05..70c13ea 100644
--- a/roles/testnode/vars/ubuntu.yml
+++ b/roles/testnode/vars/ubuntu.yml
@@ -2,3 +2,110 @@
 common_apt_repos:
   # mod_fastcgi for radosgw
   - "deb http://gitbuilder.ceph.com/libapache-mod-fastcgi-deb-{{ansible_distribution_release}}-x86_64-basic/ref/master/ {{ansible_distribution_release}} main"
+
+common_packages:
+  # for apache
+  - libfcgi0ldbl
+  ###
+  # for s3 tests
+  - python-virtualenv
+  - python-dev
+  - libevent-dev
+  ###
+  # for cpan
+  - perl
+  - libwww-perl
+  ###
+  - lsb-release
+  - build-essential
+  - sysstat
+  - gdb
+  - python-configobj
+  - python-gevent
+  # for running ceph
+  - libedit2
+  - libssl0.9.8
+  - cryptsetup-bin
+  - xfsprogs
+  - gdisk
+  - parted
+  ###
+  # for setting BIOS settings
+  - smbios-utils
+  ###
+  - libcrypto++9
+  - libuuid1
+  - libfcgi
+  - btrfs-tools
+  # for compiling helpers and such
+  - libatomic-ops-dev
+  ###
+  # used by workunits
+  - git-core
+  - attr
+  - dbench
+  - bonnie++
+  - iozone3
+  - valgrind
+  - python-nose
+  - mpich2
+  - libmpich2-dev
+  - ant
+  ###
+  # used by the xfstests tasks
+  - libtool
+  - automake
+  - gettext
+  - uuid-dev
+  - libacl1-dev
+  - bc
+  - xfsdump
+  - dmapi
+  - xfslibs-dev
+  - libattr1-dev
+  ###
+  - sysprof
+  - vim
+  - pdsh
+  - collectl
+  # for blktrace and seekwatcher
+  - blktrace
+  - python-numpy
+  - python-matplotlib
+  - mencoder
+  ###
+  # qemu
+  - genisoimage
+  ###
+  # for json_xs to investigate JSON by hand
+  - libjson-xs-perl
+  # for pretty-printing xml
+  - xml-twig-tools
+  # for java bindings, hadoop, etc.
+  - default-jdk
+  - junit4
+  ###
+  # tgt
+  - tgt
+  - open-iscsi
+  ###
+  # for disk/etc monitoring
+  - smartmontools
+  - nagios-nrpe-server
+  ###
+  # for samba testing
+  - cifs-utils
+  # for Static IP
+  - ipcalc
+  # nfs
+  - nfs-common
+  - nfs-kernel-server
+
+packages_to_upgrade:
+  - apt
+  - apache2
+  - libapache2-mod-fastcgi
+
+packages_to_remove:
+   # openmpi-common conflicts with mpitch stuff
+  - openmpi-common
diff --git a/roles/testnode/vars/ubuntu_12.04.yml b/roles/testnode/vars/ubuntu_12.04.yml
new file mode 100644
index 0000000..34e8e21
--- /dev/null
+++ b/roles/testnode/vars/ubuntu_12.04.yml
@@ -0,0 +1,11 @@
+---
+apt_repos:
+  # tgt/libleveldb:
+  - "deb http://ceph.com/packages/ceph-extras/debian/ precise main"
+
+packages:
+  - libgoogle-perftools0
+  - libboost-thread1.46.1
+  - ltp-kernel-test
+  - libmpich2-3
+  - kvm
diff --git a/roles/testnode/vars/ubuntu_14.yml b/roles/testnode/vars/ubuntu_14.yml
index 78ac51c..090e172 100644
--- a/roles/testnode/vars/ubuntu_14.yml
+++ b/roles/testnode/vars/ubuntu_14.yml
@@ -1,115 +1,12 @@
 ---
 apt_repos:
   # blkin libraries, only trusty has new enough lttng for these
-  - "deb [arch=amd64] http://apt-mirror.front.sepia.ceph.com/blkin/ trusty main"
-  - "deb http://gitbuilder.ceph.com/libapache-mod-fastcgi-deb-trusty-x86_64-basic/ref/master/ trusty main"
+  - "deb [arch=amd64] http://{{ mirror_host }}/blkin/ trusty main"
 
 packages:
-  - blkin
-  - lttng-tools
-  # for apache
-  - libfcgi0ldbl
-  ###
-  # for s3 tests
-  - python-virtualenv
-  - python-dev
-  - libevent-dev
-  ###
-  # for cpan
-  - perl
-  - libwww-perl
-  ###
-  - lsb-release
-  - build-essential
-  - sysstat
-  - gdb
-  - python-configobj
-  - python-gevent
-  # for running ceph
-  - libedit2
-  - libssl0.9.8
   - libgoogle-perftools4
   - libboost-thread1.54.0
-  - cryptsetup-bin
-  - xfsprogs
-  - gdisk
-  - parted
-  ###
-  # for setting BIOS settings
-  - smbios-utils
-  ###
-  - libcrypto++9
-  - libuuid1
-  - libfcgi
-  - btrfs-tools
-  # for compiling helpers and such
-  - libatomic-ops-dev
-  ###
-  # used by workunits
-  - git-core
-  - attr
-  - dbench
-  - bonnie++
-  - iozone3
-  - valgrind
-  - python-nose
-  - mpich2
   - mpich
-  - libmpich2-dev
-  - ant
-  ### 
-  # used by the xfstests tasks
-  - libtool
-  - automake
-  - gettext
-  - uuid-dev
-  - libacl1-dev
-  - bc
-  - xfsdump
-  - dmapi
-  - xfslibs-dev
-  - libattr1-dev
-  ###
-  - sysprof
-  - vim
-  - pdsh
-  - collectl
-  # for blktrace and seekwatcher
-  - blktrace
-  - python-numpy
-  - python-matplotlib
-  - mencoder
-  ###
-  # qemu
-  - kvm
-  - genisoimage
-  ###
-  # for json_xs to investigate JSON by hand
-  - libjson-xs-perl
-  # for pretty-printing xml
-  - xml-twig-tools
-  # for java bindings, hadoop, etc.
-  - default-jdk
-  - junit4
-  ###
-  # tgt
-  - tgt
-  - open-iscsi
-  ###
-  # for disk/etc monitoring
-  - smartmontools
-  - nagios-nrpe-server
-  ###
-  # for samba testing
-  - cifs-utils
-  # for Static IP
-  - ipcalc
-
-packages_to_upgrade:
-  - apt
-  - apache2
-  - libapache2-mod-fastcgi
-
-packages_to_remove:
-   # openmpi-common conflicts with mpitch stuff
-  - openmpi-common
+  - qemu-system-x86
+  - blkin
+  - lttng-tools