From 98de4321f6edd2572f688e4d37d99aa9f3b3cf65 Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Fri, 8 May 2020 10:54:15 +0200
Subject: [PATCH] Puppet 5 is now officially unsupported

Change-Id: I249c7ef726a10fa04736c374dd22aba889656ee6
---
 manifests/defaults.pp                                      | 7 -------
 .../notes/puppet-5-unsupported-ac35e83ee3d2b12c.yaml       | 6 ++++++
 2 files changed, 6 insertions(+), 7 deletions(-)
 create mode 100644 releasenotes/notes/puppet-5-unsupported-ac35e83ee3d2b12c.yaml

diff --git a/manifests/defaults.pp b/manifests/defaults.pp
index f1e471ff..b5e3cc09 100644
--- a/manifests/defaults.pp
+++ b/manifests/defaults.pp
@@ -6,13 +6,6 @@
 #
 class openstacklib::defaults {
 
-  # TODO(tobias-urdin): Remove this in the V release when
-  # we officially remove the support.
-  if versioncmp($::puppetversion, '6.0.0') < 0 {
-    warning('OpenStack modules support for Puppet 5 is deprecated \
-and will be officially unsupported in the V release')
-  }
-
   if ($::os['family'] == 'Debian') {
     $pyvers = '3'
     $pyver3 = '3'
diff --git a/releasenotes/notes/puppet-5-unsupported-ac35e83ee3d2b12c.yaml b/releasenotes/notes/puppet-5-unsupported-ac35e83ee3d2b12c.yaml
new file mode 100644
index 00000000..8a21fb5a
--- /dev/null
+++ b/releasenotes/notes/puppet-5-unsupported-ac35e83ee3d2b12c.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    Puppet 5 is now officially unsupported and support may be broken in any of
+    the Puppet modules in this cycle. We recommend all deployments to start
+    using Puppet 6 in this release.