Merge "Use undef to use default values"

2025-08-25 19:37:53 +00:00
parent 5157e325b0 5d54c5fd78
commit a8a6b821b9
10 changed files with 27 additions and 27 deletions
--- a/fixtures/scenario001.pp
+++ b/fixtures/scenario001.pp
@@ -26,7 +26,7 @@ case $facts['os']['family'] {
    $cache_backend = 'memcached'
    # NOTE(tkajinam): Disable due to package conflict
    $vitrage = false
-    $notification_topics = $facts['os_service_default']
+    $notification_topics = undef
  }
  'RedHat': {
    $ipv6 = true
@@ -35,7 +35,7 @@ case $facts['os']['family'] {
    #$vitrage = true
    #$notification_topics = ['notifications', 'vitrage_notifications']
    $vitrage = false
-    $notification_topics = $facts['os_service_default']
+    $notification_topics = undef
  }
  default: {
    fail("Unsupported osfamily (${facts['os']['family']})")
--- a/manifests/aodh.pp
+++ b/manifests/aodh.pp
@@ -2,10 +2,10 @@
 #
 # [*notification_topics*]
 #   (optional) AMQP topic used for OpenStack notifications
-#   Defaults to $facts['os_service_default'].
+#   Defaults to undef.
 #
 class openstack_integration::aodh (
-  $notification_topics = $facts['os_service_default'],
+  $notification_topics = undef,
 ) {
  include openstack_integration::config
  include openstack_integration::params
--- a/manifests/cinder.pp
+++ b/manifests/cinder.pp
@@ -16,13 +16,13 @@
 #
 # [*notification_topics*]
 #   (optional) AMQP topic used for OpenStack notifications
-#   Defaults to $facts['os_service_default'].
+#   Defaults to undef.
 #
 class openstack_integration::cinder (
  $backend             = 'iscsi',
  $volume_encryption   = false,
  $cinder_backup       = undef,
-  $notification_topics = $facts['os_service_default'],
+  $notification_topics = undef,
 ) {
  include openstack_integration::config
  include openstack_integration::params
--- a/manifests/designate.pp
+++ b/manifests/designate.pp
@@ -2,10 +2,10 @@
 #
 # [*notification_topics*]
 #   (optional) AMQP topic used for OpenStack notifications
-#   Defaults to $facts['os_service_default'].
+#   Defaults to undef.
 #
 class openstack_integration::designate (
-  $notification_topics = $facts['os_service_default'],
+  $notification_topics = undef,
 ) {
  include openstack_integration::config
  include openstack_integration::params
--- a/manifests/heat.pp
+++ b/manifests/heat.pp
@@ -2,10 +2,10 @@
 #
 # [*notification_topics*]
 #   (optional) AMQP topic used for OpenStack notifications
-#   Defaults to $facts['os_service_default'].
+#   Defaults to undef.
 #
 class openstack_integration::heat (
-  $notification_topics = $facts['os_service_default'],
+  $notification_topics = undef,
 ) {
  include openstack_integration::config
  include openstack_integration::params
--- a/manifests/ironic.pp
+++ b/manifests/ironic.pp
@@ -2,7 +2,7 @@
 #
 # [*notification_topics*]
 #   (optional) AMQP topic used for OpenStack notifications
-#   Defaults to $facts['os_service_default'].
+#   Defaults to undef.
 #
 # [*inspector_backend*]
 #   (optional) The storage backend for storing introspection data.
@@ -13,7 +13,7 @@
 #   Defaults to false
 #
 class openstack_integration::ironic (
-  $notification_topics      = $facts['os_service_default'],
+  $notification_topics      = undef,
  $inspector_backend        = 'database',
  $send_power_notifications = false,
 ) {
--- a/manifests/manila.pp
+++ b/manifests/manila.pp
@@ -7,11 +7,11 @@
 #
 # [*notification_topics*]
 #   (optional) AMQP topic used for OpenStack notifications
-#   Defaults to $facts['os_service_default'].
+#   Defaults to undef.
 #
 class openstack_integration::manila (
  $backend             = 'lvm',
-  $notification_topics = $facts['os_service_default'],
+  $notification_topics = undef,
 ) {
  include openstack_integration::config
  include openstack_integration::params
--- a/manifests/neutron.pp
+++ b/manifests/neutron.pp
@@ -43,7 +43,7 @@
 #
 # [*notification_topics*]
 #   (optional) AMQP topic used for OpenStack notifications
-#   Defaults to $facts['os_service_default'].
+#   Defaults to undef.
 #
 class openstack_integration::neutron (
  $driver                     = 'openvswitch',
@@ -56,7 +56,7 @@ class openstack_integration::neutron (
  $bgp_dragent_enabled        = false,
  $baremetal_enabled          = false,
  $designate_enabled          = false,
-  $notification_topics        = $facts['os_service_default'],
+  $notification_topics        = undef,
 ) {
  include openstack_integration::config
  include openstack_integration::params
@@ -323,11 +323,11 @@ Environment=OS_NEUTRON_CONFIG_FILES=${join($neutron_conf_files, ';')}",
  }
  $rpc_state_report_workers = $driver ? {
    'ovn'   => 0,
-    default => $facts['os_service_default'],
+    default => undef,
  }
  $rpc_service_name = $rpc_workers ? {
    0       => false,
-    default => $neutron::params::rpc_service_name
+    default => undef,
  }

  class { 'neutron::server':
@@ -343,11 +343,11 @@ Environment=OS_NEUTRON_CONFIG_FILES=${join($neutron_conf_files, ';')}",

  $overlay_network_type = $driver ? {
    'ovn'   => 'geneve',
-    default => 'vxlan'
+    default => 'vxlan',
  }
  $max_header_size = $driver ? {
    'ovn'   => 38,
-    default => $facts['os_service_default']
+    default => undef,
  }
  $drivers_real = $baremetal_enabled ? {
    true    => [$driver, 'baremetal'],
@@ -367,7 +367,7 @@ Environment=OS_NEUTRON_CONFIG_FILES=${join($neutron_conf_files, ';')}",
    'openvswitch': {
      $agent_extensions = $taas_enabled ? {
        true    => ['taas'],
-        default => $facts['os_service_default'],
+        default => undef,
      }

      class { 'neutron::agents::ml2::ovs':
@@ -467,7 +467,7 @@ Environment=OS_NEUTRON_CONFIG_FILES=${join($neutron_conf_files, ';')}",

    $l3_extensions = $vpnaas_enabled ? {
      true    => ['vpnaas'],
-      default => $facts['os_service_default'],
+      default => undef,
    }
    class { 'neutron::agents::l3':
      interface_driver => $driver,
--- a/manifests/nova.pp
+++ b/manifests/nova.pp
@@ -20,7 +20,7 @@
 #
 # [*notification_topics*]
 #   (optional) AMQP topic used for OpenStack notifications
-#   Defaults to $facts['os_service_default'].
+#   Defaults to undef.
 #
 # [*cinder_enabled*]
 #   (optional) Boolean to configure or not cinder options.
@@ -35,7 +35,7 @@ class openstack_integration::nova (
  $libvirt_virt_type      = 'qemu',
  $libvirt_cpu_mode       = 'none',
  $volume_encryption      = false,
-  $notification_topics    = $facts['os_service_default'],
+  $notification_topics    = undef,
  $cinder_enabled         = false,
  $libvirt_guests_enabled = false,
 ) {
@@ -240,7 +240,7 @@ class openstack_integration::nova (

  $images_type = $libvirt_rbd ? {
    true  => 'rbd',
-    false => $facts['os_service_default']
+    false => undef,
  }
  class { 'nova::compute::libvirt':
    virt_type               => $libvirt_virt_type,
--- a/manifests/octavia.pp
+++ b/manifests/octavia.pp
@@ -2,7 +2,7 @@
 #
 # [*notification_topics*]
 #   (optional) AMQP topic used for OpenStack notifications
-#   Defaults to $facts['os_service_default'].
+#   Defaults to undef.
 #
 # [*provider_driver*]
 #   (optional) Provider driver used in Octavia.
@@ -13,7 +13,7 @@
 #   Defaults to 'redis'.
 #
 class openstack_integration::octavia (
-  $notification_topics = $facts['os_service_default'],
+  $notification_topics = undef,
  $provider_driver     = 'amphora',
  $jobboard_backend    = 'redis',
 ) {