Skip to content

Commit

Permalink
neutron: disable metering agent if no ceilometer
Browse files Browse the repository at this point in the history
Also cleanup code a bit to use the proper entry points rather
than dotted path notations (which cause a warning)
  • Loading branch information
dirkmueller committed Sep 18, 2019
1 parent 940794f commit 843dced
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions chef/cookbooks/neutron/recipes/common_config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,9 @@
nova_config = Barclamp::Config.load("openstack", "nova")
nova_insecure = CrowbarOpenStackHelper.insecure(nova_config) || keystone_settings["insecure"]

service_plugins = ["neutron.services.metering.metering_plugin.MeteringPlugin",
"neutron_fwaas.services.firewall.fwaas_plugin.FirewallPlugin"]
service_plugins = ["firewall"]
service_plugins.push("metering") if node.roles.include? "ceilometer-agent"

if neutron[:neutron][:use_lbaas]
lbaas_plugin = if neutron[:neutron][:lbaasv2_driver] == "octavia"
"neutron_lbaas.services.loadbalancer.proxy_plugin.LoadBalancerProxyPluginv2"
Expand All @@ -91,11 +92,11 @@
end

if neutron[:neutron][:networking_plugin] == "ml2"
service_plugins.unshift("neutron.services.l3_router.l3_router_plugin.L3RouterPlugin")
service_plugins.unshift("router")

if neutron[:neutron][:ml2_mechanism_drivers].include?("linuxbridge") ||
neutron[:neutron][:ml2_mechanism_drivers].include?("openvswitch")
service_plugins.push("neutron.services.trunk.plugin.TrunkPlugin")
service_plugins.push("trunk")
end

if neutron[:neutron][:ml2_mechanism_drivers].include?("cisco_apic_ml2")
Expand Down

0 comments on commit 843dced

Please sign in to comment.