Renaming and repurposing file since we no longer support F20

Signed-off-by: David Galloway <dgallowa@redhat.com>

diff --git a/roles/testnode/vars/fedora_20.yml b/roles/testnode/vars/fedora_20.yml
deleted file mode 100644 (file)
index bf62b3c..0000000
--- a/roles/testnode/vars/fedora_20.yml
+++ /dev/null
@@ -1,97 +0,0 @@
----
-yum_repos:
-  fedora-fcgi-ceph:
-    name: Fedora Local fastcgi Repo
-    baseurl: http://gitbuilder.ceph.com/mod_fastcgi-rpm-fedora20-x86_64-basic/ref/master/
-    enabled: 1
-    gpgcheck: 0
-    priority: 0
-
-packages_to_upgrade:
-  - leveldb
-
-packages_to_remove:
-  - ceph-libs
-
-packages:
-  - '@core'
-  - '@base'
-  - yum-plugin-priorities
-  - redhat-lsb
-  - sysstat
-  - gdb
-  - git-all
-  - python-configobj
-  # for running ceph
-  - libedit
-  - openssl-devel
-  - google-perftools-devel
-  - boost-thread
-  - xfsprogs
-  - gdisk
-  - parted
-  - libgcrypt
-  - cryptopp-devel
-  - cryptopp
-  ###
-  # for ceph-deploy
-  - python-virtualenv
-  ###
-  # for setting BIOS settings
-  - smbios-utils
-  ###
-  - openssl
-  - libuuid
-  - fcgi-devel
-  - btrfs-progs
-  # for compiling helpers
-  - libatomic_ops-devel
-  ###
-  # used by workunits
-  - attr
-  - valgrind
-  - python-nose
-  - mpich2
-  - mpich2-devel
-  - ant
-  - dbench
-  - bonnie++
-  ###
-  # used by the xfstests tasks
-  - libtool
-  - automake
-  - gettext
-  - uuid-devel
-  - libacl-devel
-  - bc
-  - xfsdump
-  ###
-  # for blktrace and seekwatcher
-  - blktrace
-  - numpy
-  - python-matplotlib
-  ###
-  # for qemu
-  - qemu-system-x86
-  - genisoimage
-  ###
-  # for apache and rgw
-  - httpd
-  - httpd-devel
-  - httpd-tools
-  - mod_ssl
-  - mod_fastcgi-2.4.7-1.ceph.fc20
-  ###
-  - libevent-devel
-  - python-devel
-  # for json_xs to investigate JSON by hand
-  - perl-JSON
-  # for pretty-printing xml
-  - perl-XML-Twig
-  # for java bindings, hadoop, etc.
-  - java-1.7.0-openjdk-devel
-  - junit4
-  # for disk/etc monitoring
-  - smartmontools
-  # for nfs
-  - nfs-utils

diff --git a/roles/testnode/vars/fedora_22.yml b/roles/testnode/vars/fedora_22.yml
new file mode 100644 (file)
index 0000000..bf62b3c
--- /dev/null
+++ b/roles/testnode/vars/fedora_22.yml
@@ -0,0 +1,97 @@
+---
+yum_repos:
+  fedora-fcgi-ceph:
+    name: Fedora Local fastcgi Repo
+    baseurl: http://gitbuilder.ceph.com/mod_fastcgi-rpm-fedora20-x86_64-basic/ref/master/
+    enabled: 1
+    gpgcheck: 0
+    priority: 0
+
+packages_to_upgrade:
+  - leveldb
+
+packages_to_remove:
+  - ceph-libs
+
+packages:
+  - '@core'
+  - '@base'
+  - yum-plugin-priorities
+  - redhat-lsb
+  - sysstat
+  - gdb
+  - git-all
+  - python-configobj
+  # for running ceph
+  - libedit
+  - openssl-devel
+  - google-perftools-devel
+  - boost-thread
+  - xfsprogs
+  - gdisk
+  - parted
+  - libgcrypt
+  - cryptopp-devel
+  - cryptopp
+  ###
+  # for ceph-deploy
+  - python-virtualenv
+  ###
+  # for setting BIOS settings
+  - smbios-utils
+  ###
+  - openssl
+  - libuuid
+  - fcgi-devel
+  - btrfs-progs
+  # for compiling helpers
+  - libatomic_ops-devel
+  ###
+  # used by workunits
+  - attr
+  - valgrind
+  - python-nose
+  - mpich2
+  - mpich2-devel
+  - ant
+  - dbench
+  - bonnie++
+  ###
+  # used by the xfstests tasks
+  - libtool
+  - automake
+  - gettext
+  - uuid-devel
+  - libacl-devel
+  - bc
+  - xfsdump
+  ###
+  # for blktrace and seekwatcher
+  - blktrace
+  - numpy
+  - python-matplotlib
+  ###
+  # for qemu
+  - qemu-system-x86
+  - genisoimage
+  ###
+  # for apache and rgw
+  - httpd
+  - httpd-devel
+  - httpd-tools
+  - mod_ssl
+  - mod_fastcgi-2.4.7-1.ceph.fc20
+  ###
+  - libevent-devel
+  - python-devel
+  # for json_xs to investigate JSON by hand
+  - perl-JSON
+  # for pretty-printing xml
+  - perl-XML-Twig
+  # for java bindings, hadoop, etc.
+  - java-1.7.0-openjdk-devel
+  - junit4
+  # for disk/etc monitoring
+  - smartmontools
+  # for nfs
+  - nfs-utils