openstack/puppet-neutron
Code Issues Proposed changes

Merge "Fixed vpnaas agent for RedHat systems"

Browse Source
This commit is contained in:
Jenkins 2014-04-15 13:27:20 +00:00 committed by Gerrit Code Review
commit 0dc2602535
3 changed files with 4 additions and 5 deletions

2
manifests/agents/vpnaas.pp

@ -98,8 +98,6 @@ class neutron::agents::vpnaas (
name => $::neutron::params::vpnaas_agent_package,
}
} else {
# Some platforms (RedHat) do not provide a neutron VPNaaS agent package.
# The neutron VPNaaS agent config file is provided by the neutron package.
Package['neutron'] -> Neutron_vpnaas_agent_config<||>
}

4
manifests/params.pp

@ -37,8 +37,8 @@ class neutron::params {
$metering_agent_package = false
$metering_agent_service = 'neutron-metering-agent'
$vpnaas_agent_package = false
$vpnaas_agent_service = 'neutron-vpnaas-agent'
$vpnaas_agent_package = 'openstack-neutron-vpn-agent'
$vpnaas_agent_service = 'neutron-vpn-agent'
$openswan_package = 'openswan'
$l3_agent_package = false

3
spec/classes/neutron_agents_vpnaas_spec.rb

@ -133,7 +133,8 @@ describe 'neutron::agents::vpnaas' do
let :platform_params do
{ :openswan_package => 'openswan',
:vpnaas_agent_service => 'neutron-vpnaas-agent'}
:vpnaas_agent_package => 'openstack-neutron-vpn-agent',
:vpnaas_agent_service => 'neutron-vpn-agent'}
end
it_configures 'neutron vpnaas agent'