From 94a6b90a6dc72ea9053130ebe7e18eeb331194d6 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Sun, 13 Jun 2021 00:01:48 +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: Id0f6bf8e1e1f622c957477a8895ac99584176f33
---
 manifests/params.pp                                  | 12 +++++-------
 metadata.json                                        |  6 ------
 releasenotes/notes/drop-fedora-1dc8de9b3efb46ef.yaml |  4 ++++
 3 files changed, 9 insertions(+), 13 deletions(-)
 create mode 100644 releasenotes/notes/drop-fedora-1dc8de9b3efb46ef.yaml

diff --git a/manifests/params.pp b/manifests/params.pp
index b8c0d45..be77a03 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -4,12 +4,6 @@
 #
 class qdr::params {
 
-  if ($::os['name'] == 'Fedora') or
-    ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
-    $_package_provider = 'dnf'
-  } else {
-    $_package_provider = 'yum'
-  }
   case $::osfamily {
     'Debian': {
       $service_package_name = 'qdrouterd'
@@ -27,7 +21,11 @@ class qdr::params {
       $service_package_name = 'qpid-dispatch-router'
       $service_name         = 'qdrouterd'
       $service_config_path  = '/etc/qpid-dispatch/qdrouterd.conf'
-      $package_provider     = $_package_provider
+      if Integer.new($::os['release']['major']) > 7 {
+        $package_provider   = 'dnf'
+      } else {
+        $package_provider   = 'yum'
+      }
       $service_user         = 'qdrouterd'
       $service_group        = 'qdrouterd'
       $service_home         = '/var/lib/qdrouterd'
diff --git a/metadata.json b/metadata.json
index 44ccf6e..e3980dd 100644
--- a/metadata.json
+++ b/metadata.json
@@ -20,12 +20,6 @@
                 "9"
             ]
         },
-        {
-            "operatingsystem": "Fedora",
-            "operatingsystemrelease": [
-                "24"
-            ]
-        },
         {
             "operatingsystem": "RedHat",
             "operatingsystemrelease": [
diff --git a/releasenotes/notes/drop-fedora-1dc8de9b3efb46ef.yaml b/releasenotes/notes/drop-fedora-1dc8de9b3efb46ef.yaml
new file mode 100644
index 0000000..71818df
--- /dev/null
+++ b/releasenotes/notes/drop-fedora-1dc8de9b3efb46ef.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    Fedora is no longer supported.