From db032d682940315d9e8bf9995895bfd30b52ee21 Mon Sep 17 00:00:00 2001
From: zhangboye <zhangboye@inspur.com>
Date: Sat, 12 Jun 2021 15:03:27 +0800
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: Ia6de5e2c389edaecd560f1f13a19fcf17b9f6bb5
---
 metadata.json                                 |  6 -----
 .../notes/drop-fedora-56709758aa310b8d.yaml   |  4 ++++
 spec/classes/watcher_wsgi_apache_spec.rb      | 22 ++++---------------
 3 files changed, 8 insertions(+), 24 deletions(-)
 create mode 100644 releasenotes/notes/drop-fedora-56709758aa310b8d.yaml

diff --git a/metadata.json b/metadata.json
index 6bdd196..9fad82c 100644
--- a/metadata.json
+++ b/metadata.json
@@ -33,12 +33,6 @@
                 "9"
             ]
         },
-        {
-            "operatingsystem": "Fedora",
-            "operatingsystemrelease": [
-                "24"
-            ]
-        },
         {
             "operatingsystem": "RedHat",
             "operatingsystemrelease": [
diff --git a/releasenotes/notes/drop-fedora-56709758aa310b8d.yaml b/releasenotes/notes/drop-fedora-56709758aa310b8d.yaml
new file mode 100644
index 0000000..8fe95fc
--- /dev/null
+++ b/releasenotes/notes/drop-fedora-56709758aa310b8d.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    Fedora is no longer supported.
\ No newline at end of file
diff --git a/spec/classes/watcher_wsgi_apache_spec.rb b/spec/classes/watcher_wsgi_apache_spec.rb
index f3e0886..57cc4b2 100644
--- a/spec/classes/watcher_wsgi_apache_spec.rb
+++ b/spec/classes/watcher_wsgi_apache_spec.rb
@@ -95,24 +95,10 @@ describe 'watcher::wsgi::apache' do
             :wsgi_script_source => '/usr/lib/python3/dist-packages/watcher/api/app.wsgi'
           }
         when 'RedHat'
-          if facts[:operatingsystem] == 'Fedora'
-            {
-              :wsgi_script_path   => '/var/www/cgi-bin/watcher',
-              :wsgi_script_source => '/usr/lib/python3.6/site-packages/watcher/api/app.wsgi'
-            }
-          else
-            if facts[:operatingsystemmajrelease] > '7'
-              {
-                :wsgi_script_path   => '/var/www/cgi-bin/watcher',
-                :wsgi_script_source => '/usr/lib/python3.6/site-packages/watcher/api/app.wsgi'
-              }
-            else
-              {
-                :wsgi_script_path   => '/var/www/cgi-bin/watcher',
-                :wsgi_script_source => '/usr/lib/python2.7/site-packages/watcher/api/app.wsgi'
-              }
-            end
-          end
+          {
+            :wsgi_script_path   => '/var/www/cgi-bin/watcher',
+            :wsgi_script_source => '/usr/lib/python3.6/site-packages/watcher/api/app.wsgi'
+          }
         end
       end