openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Use undef to use default values"

Browse Source
This commit is contained in:
Zuul
2025-08-25 19:37:53 +00:00
committed by Gerrit Code Review
parent 5157e325b0 5d54c5fd78
commit a8a6b821b9
10 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fixtures/scenario001.pp
View File

@@ -26,7 +26,7 @@ case $facts['os']['family'] {
$cache_backend = 'memcached' $cache_backend = 'memcached'
# NOTE(tkajinam): Disable due to package conflict # NOTE(tkajinam): Disable due to package conflict
$vitrage = false $vitrage = false
$notification_topics = $facts['os_service_default'] $notification_topics = undef
} }
'RedHat': { 'RedHat': {
$ipv6 = true $ipv6 = true
@@ -35,7 +35,7 @@ case $facts['os']['family'] {
#$vitrage = true #$vitrage = true
#$notification_topics = ['notifications', 'vitrage_notifications'] #$notification_topics = ['notifications', 'vitrage_notifications']
$vitrage = false $vitrage = false
$notification_topics = $facts['os_service_default'] $notification_topics = undef
} }
default: { default: {
fail("Unsupported osfamily (${facts['os']['family']})") fail("Unsupported osfamily (${facts['os']['family']})")

4
manifests/aodh.pp
View File

@@ -2,10 +2,10 @@
# #
# [*notification_topics*] # [*notification_topics*]
# (optional) AMQP topic used for OpenStack notifications # (optional) AMQP topic used for OpenStack notifications
# Defaults to $facts['os_service_default']. # Defaults to undef.
# #
class openstack_integration::aodh ( class openstack_integration::aodh (
$notification_topics = $facts['os_service_default'], $notification_topics = undef,
) { ) {
include openstack_integration::config include openstack_integration::config
include openstack_integration::params include openstack_integration::params

4
manifests/cinder.pp
View File

@@ -16,13 +16,13 @@
# #
# [*notification_topics*] # [*notification_topics*]
# (optional) AMQP topic used for OpenStack notifications # (optional) AMQP topic used for OpenStack notifications
# Defaults to $facts['os_service_default']. # Defaults to undef.
# #
class openstack_integration::cinder ( class openstack_integration::cinder (
$backend = 'iscsi', $backend = 'iscsi',
$volume_encryption = false, $volume_encryption = false,
$cinder_backup = undef, $cinder_backup = undef,
$notification_topics = $facts['os_service_default'], $notification_topics = undef,
) { ) {
include openstack_integration::config include openstack_integration::config
include openstack_integration::params include openstack_integration::params

4
manifests/designate.pp
View File

@@ -2,10 +2,10 @@
# #
# [*notification_topics*] # [*notification_topics*]
# (optional) AMQP topic used for OpenStack notifications # (optional) AMQP topic used for OpenStack notifications
# Defaults to $facts['os_service_default']. # Defaults to undef.
# #
class openstack_integration::designate ( class openstack_integration::designate (
$notification_topics = $facts['os_service_default'], $notification_topics = undef,
) { ) {
include openstack_integration::config include openstack_integration::config
include openstack_integration::params include openstack_integration::params

4
manifests/heat.pp
View File

@@ -2,10 +2,10 @@
# #
# [*notification_topics*] # [*notification_topics*]
# (optional) AMQP topic used for OpenStack notifications # (optional) AMQP topic used for OpenStack notifications
# Defaults to $facts['os_service_default']. # Defaults to undef.
# #
class openstack_integration::heat ( class openstack_integration::heat (
$notification_topics = $facts['os_service_default'], $notification_topics = undef,
) { ) {
include openstack_integration::config include openstack_integration::config
include openstack_integration::params include openstack_integration::params

4
manifests/ironic.pp
View File

@@ -2,7 +2,7 @@
# #
# [*notification_topics*] # [*notification_topics*]
# (optional) AMQP topic used for OpenStack notifications # (optional) AMQP topic used for OpenStack notifications
# Defaults to $facts['os_service_default']. # Defaults to undef.
# #
# [*inspector_backend*] # [*inspector_backend*]
# (optional) The storage backend for storing introspection data. # (optional) The storage backend for storing introspection data.
@@ -13,7 +13,7 @@
# Defaults to false # Defaults to false
# #
class openstack_integration::ironic ( class openstack_integration::ironic (
$notification_topics = $facts['os_service_default'], $notification_topics = undef,
$inspector_backend = 'database', $inspector_backend = 'database',
$send_power_notifications = false, $send_power_notifications = false,
) { ) {

4
manifests/manila.pp
View File

@@ -7,11 +7,11 @@
# #
# [*notification_topics*] # [*notification_topics*]
# (optional) AMQP topic used for OpenStack notifications # (optional) AMQP topic used for OpenStack notifications
# Defaults to $facts['os_service_default']. # Defaults to undef.
# #
class openstack_integration::manila ( class openstack_integration::manila (
$backend = 'lvm', $backend = 'lvm',
$notification_topics = $facts['os_service_default'], $notification_topics = undef,
) { ) {
include openstack_integration::config include openstack_integration::config
include openstack_integration::params include openstack_integration::params

16
manifests/neutron.pp
View File

@@ -43,7 +43,7 @@
# #
# [*notification_topics*] # [*notification_topics*]
# (optional) AMQP topic used for OpenStack notifications # (optional) AMQP topic used for OpenStack notifications
# Defaults to $facts['os_service_default']. # Defaults to undef.
# #
class openstack_integration::neutron ( class openstack_integration::neutron (
$driver = 'openvswitch', $driver = 'openvswitch',
@@ -56,7 +56,7 @@ class openstack_integration::neutron (
$bgp_dragent_enabled = false, $bgp_dragent_enabled = false,
$baremetal_enabled = false, $baremetal_enabled = false,
$designate_enabled = false, $designate_enabled = false,
$notification_topics = $facts['os_service_default'], $notification_topics = undef,
) { ) {
include openstack_integration::config include openstack_integration::config
include openstack_integration::params include openstack_integration::params
@@ -323,11 +323,11 @@ Environment=OS_NEUTRON_CONFIG_FILES=${join($neutron_conf_files, ';')}",
} }
$rpc_state_report_workers = $driver ? { $rpc_state_report_workers = $driver ? {
'ovn' => 0, 'ovn' => 0,
default => $facts['os_service_default'], default => undef,
} }
$rpc_service_name = $rpc_workers ? { $rpc_service_name = $rpc_workers ? {
0 => false, 0 => false,
default => $neutron::params::rpc_service_name default => undef,
} }
class { 'neutron::server': class { 'neutron::server':
@@ -343,11 +343,11 @@ Environment=OS_NEUTRON_CONFIG_FILES=${join($neutron_conf_files, ';')}",
$overlay_network_type = $driver ? { $overlay_network_type = $driver ? {
'ovn' => 'geneve', 'ovn' => 'geneve',
default => 'vxlan' default => 'vxlan',
} }
$max_header_size = $driver ? { $max_header_size = $driver ? {
'ovn' => 38, 'ovn' => 38,
default => $facts['os_service_default'] default => undef,
} }
$drivers_real = $baremetal_enabled ? { $drivers_real = $baremetal_enabled ? {
true => [$driver, 'baremetal'], true => [$driver, 'baremetal'],
@@ -367,7 +367,7 @@ Environment=OS_NEUTRON_CONFIG_FILES=${join($neutron_conf_files, ';')}",
'openvswitch': { 'openvswitch': {
$agent_extensions = $taas_enabled ? { $agent_extensions = $taas_enabled ? {
true => ['taas'], true => ['taas'],
default => $facts['os_service_default'], default => undef,
} }
class { 'neutron::agents::ml2::ovs': class { 'neutron::agents::ml2::ovs':
@@ -467,7 +467,7 @@ Environment=OS_NEUTRON_CONFIG_FILES=${join($neutron_conf_files, ';')}",
$l3_extensions = $vpnaas_enabled ? { $l3_extensions = $vpnaas_enabled ? {
true => ['vpnaas'], true => ['vpnaas'],
default => $facts['os_service_default'], default => undef,
} }
class { 'neutron::agents::l3': class { 'neutron::agents::l3':
interface_driver => $driver, interface_driver => $driver,

6
manifests/nova.pp
View File

@@ -20,7 +20,7 @@
# #
# [*notification_topics*] # [*notification_topics*]
# (optional) AMQP topic used for OpenStack notifications # (optional) AMQP topic used for OpenStack notifications
# Defaults to $facts['os_service_default']. # Defaults to undef.
# #
# [*cinder_enabled*] # [*cinder_enabled*]
# (optional) Boolean to configure or not cinder options. # (optional) Boolean to configure or not cinder options.
@@ -35,7 +35,7 @@ class openstack_integration::nova (
$libvirt_virt_type = 'qemu', $libvirt_virt_type = 'qemu',
$libvirt_cpu_mode = 'none', $libvirt_cpu_mode = 'none',
$volume_encryption = false, $volume_encryption = false,
$notification_topics = $facts['os_service_default'], $notification_topics = undef,
$cinder_enabled = false, $cinder_enabled = false,
$libvirt_guests_enabled = false, $libvirt_guests_enabled = false,
) { ) {
@@ -240,7 +240,7 @@ class openstack_integration::nova (
$images_type = $libvirt_rbd ? { $images_type = $libvirt_rbd ? {
true => 'rbd', true => 'rbd',
false => $facts['os_service_default'] false => undef,
} }
class { 'nova::compute::libvirt': class { 'nova::compute::libvirt':
virt_type => $libvirt_virt_type, virt_type => $libvirt_virt_type,

4
manifests/octavia.pp
View File

@@ -2,7 +2,7 @@
# #
# [*notification_topics*] # [*notification_topics*]
# (optional) AMQP topic used for OpenStack notifications # (optional) AMQP topic used for OpenStack notifications
# Defaults to $facts['os_service_default']. # Defaults to undef.
# #
# [*provider_driver*] # [*provider_driver*]
# (optional) Provider driver used in Octavia. # (optional) Provider driver used in Octavia.
@@ -13,7 +13,7 @@
# Defaults to 'redis'. # Defaults to 'redis'.
# #
class openstack_integration::octavia ( class openstack_integration::octavia (
$notification_topics = $facts['os_service_default'], $notification_topics = undef,
$provider_driver = 'amphora', $provider_driver = 'amphora',
$jobboard_backend = 'redis', $jobboard_backend = 'redis',
) { ) {