openstack/puppet-neutron
Code Issues Proposed changes

Fixed metering agent package for Red Hat systems

Browse Source 
RDO now installs the neutron metering agent service in a separate
package. The metering agent class now installs the package with
correct configuration and service dependencies.

Change-Id: Ibe96fcd9299445c502af0bfb5363005c86fec9f6
This commit is contained in:
Chris Hoge 2014-04-30 15:00:25 -07:00
parent f9b3d184a0
commit 1c75c20831
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/agents/metering.pp
View File

@ -87,8 +87,7 @@ class neutron::agents::metering (
name => $::neutron::params::metering_agent_package,
}
} else {
# Some platforms (RedHat) do not provide a neutron metering agent package.
# The neutron metering agent config file is provided by the neutron package.
# Default dependency if the system does not provide a neutron metering agent package.
Package['neutron'] -> Neutron_metering_agent_config<||>
}

2
manifests/params.pp
View File

@ -34,7 +34,7 @@ class neutron::params {
$haproxy_package = 'haproxy'
$metering_agent_package = false
$metering_agent_package = 'openstack-neutron-metering-agent'
$metering_agent_service = 'neutron-metering-agent'
$vpnaas_agent_package = 'openstack-neutron-vpn-agent'

3
spec/classes/neutron_agents_metering_spec.rb
View File

@ -111,7 +111,8 @@ describe 'neutron::agents::metering' do
end
let :platform_params do
{ :metering_agent_service => 'neutron-metering-agent' }
{ :metering_agent_package => 'openstack-neutron-metering-agent',
:metering_agent_service => 'neutron-metering-agent' }
end
it_configures 'neutron metering agent'