From e1b0c4eaa1206621d53097623683d8fac10364e1 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Sat, 12 Jun 2021 23:46:42 +0900
Subject: [PATCH] Drop Fedora support

Fedora support is never tested, and has been unmaintained for a while.
Because we don't expect any actual user using OpenStack on Fedora, this
change drops support for Fedora directly.

Change-Id: I9ec4a576b576b6eea50a81846f1590ece73350d9
---
 .../notes/drop-fedora-7ea493ab73fa8a0f.yaml   |  4 +++
 spec/classes/zaqar_wsgi_apache_spec.rb        | 30 ++++---------------
 2 files changed, 10 insertions(+), 24 deletions(-)
 create mode 100644 releasenotes/notes/drop-fedora-7ea493ab73fa8a0f.yaml

diff --git a/releasenotes/notes/drop-fedora-7ea493ab73fa8a0f.yaml b/releasenotes/notes/drop-fedora-7ea493ab73fa8a0f.yaml
new file mode 100644
index 0000000..71818df
--- /dev/null
+++ b/releasenotes/notes/drop-fedora-7ea493ab73fa8a0f.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    Fedora is no longer supported.
diff --git a/spec/classes/zaqar_wsgi_apache_spec.rb b/spec/classes/zaqar_wsgi_apache_spec.rb
index 29e39df..3c2e584 100644
--- a/spec/classes/zaqar_wsgi_apache_spec.rb
+++ b/spec/classes/zaqar_wsgi_apache_spec.rb
@@ -97,30 +97,12 @@ describe 'zaqar::wsgi::apache' do
             :wsgi_script_source => '/usr/lib/python3/dist-packages/zaqar/transport/wsgi/app.py'
           }
         when 'RedHat'
-          if facts[:operatingsystem] == 'Fedora'
-            {
-              :httpd_service_name => 'httpd',
-              :httpd_ports_file   => '/etc/httpd/conf/ports.conf',
-              :wsgi_script_path   => '/var/www/cgi-bin/zaqar',
-              :wsgi_script_source => '/usr/lib/python3.6/site-packages/zaqar/transport/wsgi/app.py'
-            }
-          else
-            if facts[:operatingsystemmajrelease] > '7'
-              {
-                :httpd_service_name => 'httpd',
-                :httpd_ports_file   => '/etc/httpd/conf/ports.conf',
-                :wsgi_script_path   => '/var/www/cgi-bin/zaqar',
-                :wsgi_script_source => '/usr/lib/python3.6/site-packages/zaqar/transport/wsgi/app.py'
-              }
-            else
-              {
-                :httpd_service_name => 'httpd',
-                :httpd_ports_file   => '/etc/httpd/conf/ports.conf',
-                :wsgi_script_path   => '/var/www/cgi-bin/zaqar',
-                :wsgi_script_source => '/usr/lib/python2.7/site-packages/zaqar/transport/wsgi/app.py'
-              }
-            end
-          end
+          {
+            :httpd_service_name => 'httpd',
+            :httpd_ports_file   => '/etc/httpd/conf/ports.conf',
+            :wsgi_script_path   => '/var/www/cgi-bin/zaqar',
+            :wsgi_script_source => '/usr/lib/python3.6/site-packages/zaqar/transport/wsgi/app.py'
+          }
         end
       end