From 84cb1a00612de11fb24846ae820e981a0d732a61 Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Tue, 9 Jun 2020 20:42:31 +0200
Subject: [PATCH] copr-fe: easier logic for upgrade playbook

---
 playbooks/manual/copr/copr-frontend-upgrade.yml | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/playbooks/manual/copr/copr-frontend-upgrade.yml b/playbooks/manual/copr/copr-frontend-upgrade.yml
index dbf468fff4..28382755c7 100644
--- a/playbooks/manual/copr/copr-frontend-upgrade.yml
+++ b/playbooks/manual/copr/copr-frontend-upgrade.yml
@@ -22,17 +22,10 @@
     changed_when: "frontend_has_update.rc != 0"
     failed_when: false
 
-  - name: Check if HTTPD is running
-    shell: systemctl status httpd
-    register: httpd_running
-    changed_when: "httpd_running.rc != 0"
-    failed_when: false
-
-  - name: Shutdown httpd to allow running DB migrations
-    shell: timeout 20 systemctl stop httpd || systemctl kill httpd
-    when:
-    - frontend_has_update.changed
-    - httpd_running.changed
+  - name: make httpd stopped
+    service: name=httpd state=stopped
+    register: httpd_stopped
+    when: frontend_has_update.changed
 
   - name: Upgrade copr-frontend packages
     dnf:
@@ -53,6 +46,7 @@
 
   - name: make httpd started
     service: name=httpd state=started
+    when: httpd_stopped.changed
 
   handlers:
   - import_tasks: "{{ handlers_path }}/restart_services.yml"