Skip to content

Commit cd831f7

Browse files
committed
Install package libreswan in RHEL 7 systems for vpnaas
RHEL 7 systems have replaced the openswan package with libreswan. Change-Id: I4c8e891b83b8301cb111af1be6e84ec4cf9c69a1
1 parent 3e8f7bc commit cd831f7

2 files changed

Lines changed: 26 additions & 4 deletions

File tree

manifests/params.pp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,11 @@
4343

4444
$vpnaas_agent_package = 'openstack-neutron-vpn-agent'
4545
$vpnaas_agent_service = 'neutron-vpn-agent'
46-
$openswan_package = 'openswan'
46+
if $::operatingsystemrelease =~ /^7.*/ {
47+
$openswan_package = 'libreswan'
48+
} else {
49+
$openswan_package = 'openswan'
50+
}
4751

4852
$l3_agent_package = false
4953
$l3_agent_service = 'neutron-l3-agent'

spec/classes/neutron_agents_vpnaas_spec.rb

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,13 +126,31 @@
126126
it_configures 'neutron vpnaas agent'
127127
end
128128

129-
context 'on RedHat platforms' do
129+
context 'on RedHat 6 platforms' do
130130
let :facts do
131-
{ :osfamily => 'RedHat' }
131+
{ :osfamily => 'RedHat',
132+
:operatingsystemrelease => '6.5',
133+
:operatingsystemmajrelease => 6 }
132134
end
133135

134136
let :platform_params do
135-
{ :openswan_package => 'openswan',
137+
{ :openswan_package => 'openswan',
138+
:vpnaas_agent_package => 'openstack-neutron-vpn-agent',
139+
:vpnaas_agent_service => 'neutron-vpn-agent'}
140+
end
141+
142+
it_configures 'neutron vpnaas agent'
143+
end
144+
145+
context 'on RedHat 7 platforms' do
146+
let :facts do
147+
{ :osfamily => 'RedHat',
148+
:operatingsystemrelease => '7.1.2',
149+
:operatingsystemmajrelease => 7 }
150+
end
151+
152+
let :platform_params do
153+
{ :openswan_package => 'libreswan',
136154
:vpnaas_agent_package => 'openstack-neutron-vpn-agent',
137155
:vpnaas_agent_service => 'neutron-vpn-agent'}
138156
end

0 commit comments

Comments
 (0)