openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Neutron: Enable metering agent only when Telemetry is enabled"

Browse Source
This commit is contained in:
Zuul 2023-03-10 09:00:22 +00:00 committed by Gerrit Code Review
commit 747dc5f381
4 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fixtures/scenario001.pp
View File

@ -69,6 +69,7 @@ class { 'openstack_integration::glance':
} }
class { 'openstack_integration::neutron': class { 'openstack_integration::neutron':
notification_topics => $notification_topics, notification_topics => $notification_topics,
metering_enabled => true,
} }
include openstack_integration::placement include openstack_integration::placement
class { 'openstack_integration::nova': class { 'openstack_integration::nova':

4
fixtures/scenario002.pp
View File

@ -57,7 +57,9 @@ class { 'openstack_integration::glance':
backend => 'swift', backend => 'swift',
image_encryption => true, image_encryption => true,
} }
include openstack_integration::neutron class { 'openstack_integration::neutron':
metering_enabled => true,
}
include openstack_integration::swift include openstack_integration::swift
include openstack_integration::ironic include openstack_integration::ironic
include openstack_integration::zaqar include openstack_integration::zaqar

21
manifests/neutron.pp
View File

@ -5,6 +5,10 @@
# Can be: openvswitch, linuxbridge or ovn. # Can be: openvswitch, linuxbridge or ovn.
# Defaults to 'openvswitch'. # Defaults to 'openvswitch'.
# #
# [*metering_enabled*]
# (optional) Flag to enable metering agent
# Defaults to false.
#
# [*bgpvpn_enabled*] # [*bgpvpn_enabled*]
# (optional) Flag to enable BGPVPN # (optional) Flag to enable BGPVPN
# API extensions. # API extensions.
@ -24,6 +28,7 @@
# #
class openstack_integration::neutron ( class openstack_integration::neutron (
$driver = 'openvswitch', $driver = 'openvswitch',
$metering_enabled = false,
$bgpvpn_enabled = false, $bgpvpn_enabled = false,
$l2gw_enabled = false, $l2gw_enabled = false,
$bgp_dragent_enabled = false, $bgp_dragent_enabled = false,
@ -115,7 +120,10 @@ class openstack_integration::neutron (
$providers_list = undef $providers_list = undef
} else { } else {
$dhcp_agent_notification = true $dhcp_agent_notification = true
$metering_plugin = $metering_enabled ? {
true => 'metering',
default => undef,
}
$bgpvpn_plugin = $bgpvpn_enabled ? { $bgpvpn_plugin = $bgpvpn_enabled ? {
true => 'bgpvpn', true => 'bgpvpn',
default => undef, default => undef,
@ -144,7 +152,7 @@ class openstack_integration::neutron (
default => undef, default => undef,
} }
$plugins_list = delete_undef_values(['router', 'metering', 'qos', 'trunk', $bgpvpn_plugin, $l2gw_plugin, $bgp_dr_plugin]) $plugins_list = delete_undef_values(['router', 'qos', 'trunk', $metering_plugin, $bgpvpn_plugin, $l2gw_plugin, $bgp_dr_plugin])
} }
if $driver == 'linuxbridge' { if $driver == 'linuxbridge' {
@ -311,9 +319,12 @@ class openstack_integration::neutron (
interface_driver => $driver, interface_driver => $driver,
debug => true, debug => true,
} }
class { 'neutron::agents::metering':
interface_driver => $driver, if $metering_enabled {
debug => true, class { 'neutron::agents::metering':
interface_driver => $driver,
debug => true,
}
} }
} }
class { 'neutron::server::notifications::nova': class { 'neutron::server::notifications::nova':

5
manifests/tempest.pp
View File

@ -236,7 +236,10 @@ class openstack_integration::tempest (
} else { } else {
$neutron_agent_scheduler_extensions = ['dhcp_agent_scheduler', 'l3_agent_scheduler'] $neutron_agent_scheduler_extensions = ['dhcp_agent_scheduler', 'l3_agent_scheduler']
$neutron_l3_extensions = ['dvr', 'l3-flavors', 'l3-ha'] $neutron_l3_extensions = ['dvr', 'l3-flavors', 'l3-ha']
$neutron_metering_extensions = ['metering'] $neutron_metering_extensions = $ceilometer ? {
true => ['metering'],
default => []
}
} }
$neutron_l2gw_extensions = $l2gw ? { $neutron_l2gw_extensions = $l2gw ? {