diff --git a/manifests/agents/metering.pp b/manifests/agents/metering.pp index b2b4c9602..917215ceb 100644 --- a/manifests/agents/metering.pp +++ b/manifests/agents/metering.pp @@ -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<||> } diff --git a/manifests/params.pp b/manifests/params.pp index 22a0554ae..88f579e77 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -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' diff --git a/spec/classes/neutron_agents_metering_spec.rb b/spec/classes/neutron_agents_metering_spec.rb index 64b6d30dc..03300f7d6 100644 --- a/spec/classes/neutron_agents_metering_spec.rb +++ b/spec/classes/neutron_agents_metering_spec.rb @@ -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'