From d2ee064b7d76f7abd27738b55522107817f579b0 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 9 Oct 2020 09:11:41 +0900 Subject: [PATCH] Cleanup codes for CentOS/RHEL7 ... since now this modules supports only CentOS8/RHEL8. Change-Id: Ie342d8bda53d64aaed0397d38b825acb22315448 --- manifests/params.pp | 10 +--------- .../notes/drop-el7-support-a9e7a5f1ce9e9c36.yaml | 4 ++++ 2 files changed, 5 insertions(+), 9 deletions(-) create mode 100644 releasenotes/notes/drop-el7-support-a9e7a5f1ce9e9c36.yaml diff --git a/manifests/params.pp b/manifests/params.pp index 19e99f719..4cf5fadab 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -75,15 +75,7 @@ class neutron::params { $ovn_metadata_agent_package = "python${pyvers}-networking-ovn-metadata-agent" $dynamic_routing_package = false $bgp_dragent_package = 'openstack-neutron-bgp-dragent' - if $::operatingsystem == 'Fedora' { - $openswan_package = 'libreswan' - } else { - if $::operatingsystemmajrelease >= '7' { - $openswan_package = 'libreswan' - } else { - $openswan_package = 'openswan' - } - } + $openswan_package = 'libreswan' $libreswan_package = 'libreswan' $metadata_agent_package = false $l3_agent_package = false diff --git a/releasenotes/notes/drop-el7-support-a9e7a5f1ce9e9c36.yaml b/releasenotes/notes/drop-el7-support-a9e7a5f1ce9e9c36.yaml new file mode 100644 index 000000000..40fee5962 --- /dev/null +++ b/releasenotes/notes/drop-el7-support-a9e7a5f1ce9e9c36.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + Compatibility with el7 (RHEL7.x, CentOS7.x and so on) has been removed.