openstack/puppet-neutron
Code Issues Proposed changes

Merge "Accommodate for VPNaaS package name change in RDO"

Browse Source
This commit is contained in:
Jenkins
2015-09-24 20:13:38 +00:00
committed by Gerrit Code Review
parent 0a9e38e192 5c9b34f028
commit 2c1bca9641
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/params.pp
View File

@@ -56,7 +56,7 @@ class neutron::params {
$metering_agent_package = 'openstack-neutron-metering-agent' $metering_agent_package = 'openstack-neutron-metering-agent'
$metering_agent_service = 'neutron-metering-agent' $metering_agent_service = 'neutron-metering-agent'
$vpnaas_agent_package = 'openstack-neutron-vpn-agent' $vpnaas_agent_package = 'openstack-neutron-vpnaas'
$vpnaas_agent_service = 'neutron-vpn-agent' $vpnaas_agent_service = 'neutron-vpn-agent'
if $::operatingsystemrelease =~ /^7.*/ or $::operatingsystem == 'Fedora' { if $::operatingsystemrelease =~ /^7.*/ or $::operatingsystem == 'Fedora' {
$openswan_package = 'libreswan' $openswan_package = 'libreswan'

4
spec/classes/neutron_agents_vpnaas_spec.rb
View File

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