From 445eb54d984ebcd5c5f54b32910c0cb7d31f2d50 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 3 Apr 2020 08:49:57 +0900 Subject: [PATCH] Fix incorrect openswan package in CentOS8 This is a partial backport of f7bc1dc4f207f45cc561e933a65f048813f1b8d1, and makes sure that we install libreswan instead of openswan in CentOS8 and RHEL8. Change-Id: Ib47deec4a365a96e3e2b7972f65df089003bb68f --- manifests/params.pp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 997bdea2b..fe5fb5ecb 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -75,10 +75,14 @@ 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 $::operatingsystemrelease =~ /^7.*/ or $::operatingsystem == 'Fedora' { + if $::operatingsystem == 'Fedora' { $openswan_package = 'libreswan' } else { - $openswan_package = 'openswan' + if $::operatingsystemmajrelease >= '7' { + $openswan_package = 'libreswan' + } else { + $openswan_package = 'openswan' + } } $libreswan_package = 'libreswan' $metadata_agent_package = false