From 0c34071fe92138e7d24a7af9eec3457314199834 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Sun, 10 Apr 2022 19:13:42 +0900
Subject: [PATCH] Contrail: Support timeout parameters

Change-Id: Id5fabbdd38d03835d6b3fc750c108123fd719e6d
---
 manifests/plugins/opencontrail.pp                    | 12 ++++++++++++
 .../notes/contrail-timeout-c4a123c13872f4c6.yaml     |  5 +++++
 spec/classes/neutron_plugins_opencontrail_spec.rb    |  6 ++++--
 3 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/contrail-timeout-c4a123c13872f4c6.yaml

diff --git a/manifests/plugins/opencontrail.pp b/manifests/plugins/opencontrail.pp
index 62272ce6e..813cf4086 100644
--- a/manifests/plugins/opencontrail.pp
+++ b/manifests/plugins/opencontrail.pp
@@ -23,6 +23,14 @@
 #       contrail_extensions => ['ipam:neutron_plugin_contrail.plugins.opencontrail.contrail_plugin_ipam.NeutronPluginContrailIpam']
 #     }
 #
+# [*timeout*]
+#   (Optional) VNC API Server request timeout in seconds.
+#   Defaults to $::os_service_default
+#
+# [*connection_timeout*]
+#   (Optional) VNC API Server connection timeout in seconds.
+#   Defaults to $::os_service_default
+#
 # [*package_ensure*]
 #   (Optional) Ensure state for package.
 #   Defaults to 'present'.
@@ -59,6 +67,8 @@ class neutron::plugins::opencontrail (
   $api_server_port            = $::os_service_default,
   $multi_tenancy              = $::os_service_default,
   $contrail_extensions        = $::os_service_default,
+  $timeout                    = $::os_service_default,
+  $connection_timeout         = $::os_service_default,
   $package_ensure             = 'present',
   $purge_config               = false,
   # DEPRECATED PARAMETERS
@@ -126,6 +136,8 @@ class neutron::plugins::opencontrail (
     'APISERVER/api_server_port':     value => $api_server_port;
     'APISERVER/multi_tenancy':       value => $multi_tenancy;
     'APISERVER/contrail_extensions': value => join($contrail_extensions, ',');
+    'APISERVER/timeout':             value => $timeout;
+    'APISERVER/connection_timeout':  value => $connection_timeout;
   }
 
   neutron_plugin_opencontrail {
diff --git a/releasenotes/notes/contrail-timeout-c4a123c13872f4c6.yaml b/releasenotes/notes/contrail-timeout-c4a123c13872f4c6.yaml
new file mode 100644
index 000000000..2c41fd9e1
--- /dev/null
+++ b/releasenotes/notes/contrail-timeout-c4a123c13872f4c6.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    The ``neutron::plugins::contrail`` class now support the ``timeout``
+    parameter and the ``connection_timeout`` parameter.
diff --git a/spec/classes/neutron_plugins_opencontrail_spec.rb b/spec/classes/neutron_plugins_opencontrail_spec.rb
index 0b5ff9963..80f50ebd7 100644
--- a/spec/classes/neutron_plugins_opencontrail_spec.rb
+++ b/spec/classes/neutron_plugins_opencontrail_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'neutron::plugins::opencontrail' do
-  shared_examples 'neutron::opencontrail::plugin' do
+  shared_examples 'neutron::plugins::contrail' do
     let :params do
       {
         :api_server_ip       => '10.0.0.1',
@@ -23,6 +23,8 @@ describe 'neutron::plugins::opencontrail' do
       should contain_neutron_plugin_opencontrail('APISERVER/api_server_port').with_value(params[:api_server_port])
       should contain_neutron_plugin_opencontrail('APISERVER/multi_tenancy').with_value(params[:multi_tenancy])
       should contain_neutron_plugin_opencontrail('APISERVER/contrail_extensions').with_value(params[:contrail_extensions].join(','))
+      should contain_neutron_plugin_opencontrail('APISERVER/timeout').with_value('<SERVICE DEFAULT>')
+      should contain_neutron_plugin_opencontrail('APISERVER/connection_timeout').with_value('<SERVICE DEFAULT>')
     end
   end
 
@@ -69,7 +71,7 @@ describe 'neutron::plugins::opencontrail' do
         facts.merge!(OSDefaults.get_facts())
       end
 
-      it_behaves_like 'neutron::opencontrail::plugin'
+      it_behaves_like 'neutron::plugins::contrail'
       it_behaves_like "neutron::plugins::opencontrail on #{facts[:osfamily]}"
     end
   end