From d5118d18d8a0857e99f6e962a07f80899407e954 Mon Sep 17 00:00:00 2001
From: Josef Skladanka <jskladan@redhat.com>
Date: Thu, 23 May 2019 09:06:09 +0200
Subject: [PATCH] Testdays - return yum-install to resultsdb

---
 roles/taskotron/resultsdb-backend/tasks/main.yml  | 11 ++++++++++-
 roles/taskotron/resultsdb-frontend/tasks/main.yml |  9 ++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/roles/taskotron/resultsdb-backend/tasks/main.yml b/roles/taskotron/resultsdb-backend/tasks/main.yml
index eb66d9d094..6b4ccde34c 100644
--- a/roles/taskotron/resultsdb-backend/tasks/main.yml
+++ b/roles/taskotron/resultsdb-backend/tasks/main.yml
@@ -2,6 +2,15 @@
 - name: start httpd (provided in the apache role)
   service: name=httpd state=started
 
+- name: ensure packages required for resultsdb are installed (yum - required for testdays)
+  package: name={{ item }} state=present
+  with_items:
+    - resultsdb
+    - mod_wsgi
+    - python-psycopg2
+    - libsemanage-python
+  when: ansible_distribution_major_version|int < 22
+
 - name: ensure packages required for resultsdb are installed (dnf)
   dnf: name={{ item }} state=present
   with_items:
@@ -9,7 +18,7 @@
     - python3-mod_wsgi
     - python3-psycopg2
     - python2-libsemanage
-  when: ansible_cmdline.ostree is not defined
+  when: ansible_distribution_major_version|int > 21 and ansible_cmdline.ostree is not defined
 
 - name: ensure database is created
   delegate_to: "{{ resultsdb_db_host_machine }}"
diff --git a/roles/taskotron/resultsdb-frontend/tasks/main.yml b/roles/taskotron/resultsdb-frontend/tasks/main.yml
index db1b7b0df5..1ddbb0b21c 100644
--- a/roles/taskotron/resultsdb-frontend/tasks/main.yml
+++ b/roles/taskotron/resultsdb-frontend/tasks/main.yml
@@ -2,12 +2,19 @@
 - name: start httpd (provided in the apache role)
   service: name=httpd state=started
 
+- name: ensure packages required for resultsdb_frontend are installed (yum - required for testdays)
+  package: name={{ item }} state=present
+  with_items:
+    - resultsdb_frontend
+    - mod_wsgi
+  when: ansible_distribution_major_version|int < 22
+
 - name: ensure packages required for resultsdb_frontend are installed (dnf)
   dnf: name={{ item }} state=present
   with_items:
     - resultsdb_frontend
     - python3-mod_wsgi
-  when: ansible_cmdline.ostree is not defined
+  when: ansible_distribution_major_version|int > 21 and ansible_cmdline.ostree is not defined
 
 - name: ensure selinux lets httpd talk to the network
   seboolean: name=httpd_can_network_connect persistent=yes state=yes