From e25e7a6bcc24742c43afe853e847ad005ffa1e9b Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 15 Nov 2021 19:20:30 +0900
Subject: [PATCH] neutron: Avoid hard-coding defaults

This change replaces redundant defaults in nova::neutron, which define
the exact same values as service defaults, by $::os_service_default, to
reduce effort to maintain the implementations to keep them consistent
with any update in nova itself.

Change-Id: Ia01c936611a846399f19b1b0425e5ab4ff18a9e1
---
 manifests/network/neutron.pp              | 20 ++++++++++----------
 spec/classes/nova_network_neutron_spec.rb | 18 +++++++++---------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/manifests/network/neutron.pp b/manifests/network/neutron.pp
index 5ff203618..729588d43 100644
--- a/manifests/network/neutron.pp
+++ b/manifests/network/neutron.pp
@@ -70,27 +70,27 @@
 #
 # [*ovs_bridge*]
 #   (optional) Name of Integration Bridge used by Open vSwitch
-#   Defaults to 'br-int'
+#   Defaults to $::os_service_default
 #
 # [*extension_sync_interval*]
 #   (optional) Number of seconds before querying neutron for extensions
-#   Defaults to '600'
+#   Defaults to $::os_service_default
 #
 # [*vif_plugging_is_fatal*]
 #   (optional) Fail to boot instance if vif plugging fails.
 #   This prevents nova from booting an instance if vif plugging notification
 #   is not received from neutron.
-#   Defaults to 'True'
+#   Defaults to $::os_service_default
 #
 # [*vif_plugging_timeout*]
 #   (optional) Number of seconds to wait for neutron vif plugging events.
 #   Set to '0' and vif_plugging_is_fatal to 'False' if vif plugging
 #   notification is not being used.
-#   Defaults to '300'
+#   Defaults to $::os_service_default
 #
 # [*default_floating_pool*]
 #   (optional) Default pool for floating IPs
-#   Defaults to 'nova'
+#   Defaults to $::os_service_default
 #
 class nova::network::neutron (
   $password,
@@ -107,11 +107,11 @@ class nova::network::neutron (
   $region_name             = 'RegionOne',
   $http_retries            = $::os_service_default,
   $service_type            = $::os_service_default,
-  $ovs_bridge              = 'br-int',
-  $extension_sync_interval = '600',
-  $vif_plugging_is_fatal   = true,
-  $vif_plugging_timeout    = '300',
-  $default_floating_pool   = 'nova',
+  $ovs_bridge              = $::os_service_default,
+  $extension_sync_interval = $::os_service_default,
+  $vif_plugging_is_fatal   = $::os_service_default,
+  $vif_plugging_timeout    = $::os_service_default,
+  $default_floating_pool   = $::os_service_default,
 ) {
 
   include nova::deps
diff --git a/spec/classes/nova_network_neutron_spec.rb b/spec/classes/nova_network_neutron_spec.rb
index e927325f5..2e7eb152d 100644
--- a/spec/classes/nova_network_neutron_spec.rb
+++ b/spec/classes/nova_network_neutron_spec.rb
@@ -16,11 +16,11 @@ describe 'nova::network::neutron' do
       :endpoint_override       => '<SERVICE DEFAULT>',
       :http_retries            => '<SERVICE DEFAULT>',
       :service_type            => '<SERVICE DEFAULT>',
-      :ovs_bridge              => 'br-int',
-      :extension_sync_interval => '600',
-      :vif_plugging_is_fatal   => true,
-      :vif_plugging_timeout    => '300',
-      :default_floating_pool   => 'nova',
+      :ovs_bridge              => '<SERVICE DEFAULT>',
+      :extension_sync_interval => '<SERVICE DEFAULT>',
+      :vif_plugging_is_fatal   => '<SERVICE DEFAULT>',
+      :vif_plugging_timeout    => '<SERVICE DEFAULT>',
+      :default_floating_pool   => '<SERVICE DEFAULT>',
     }
   end
 
@@ -73,10 +73,10 @@ describe 'nova::network::neutron' do
           :http_retries            => 3,
           :service_type            => 'network',
           :ovs_bridge              => 'br-int',
-          :extension_sync_interval => '600',
-          :vif_plugging_is_fatal   => false,
-          :vif_plugging_timeout    => '0',
-          :default_floating_pool   => 'public'
+          :extension_sync_interval => 600,
+          :vif_plugging_is_fatal   => true,
+          :vif_plugging_timeout    => 300,
+          :default_floating_pool   => 'nova'
         )
       end