diff --git a/manifests/plugins/ml2/arista.pp b/manifests/plugins/ml2/arista.pp index 857c57bea..c3361bc3a 100644 --- a/manifests/plugins/ml2/arista.pp +++ b/manifests/plugins/ml2/arista.pp @@ -42,6 +42,10 @@ # (optional) Defines if hostnames are sent to Arista EOS as FQDNS # Defaults to $::os_service_default # +# [*conn_timeout*] +# (optional) Connection timeout interval in seconds. +# Defaults to $::os_service_default +# # [*package_ensure*] # (optional) The intended state of the python-networking-baremetal # package, i.e. any of the possible values of the 'ensure' @@ -54,6 +58,7 @@ class neutron::plugins::ml2::arista( $eapi_password, $region_name = $::os_service_default, $sync_interval = $::os_service_default, + $conn_timeout = $::os_service_default, $use_fqdn = $::os_service_default, $package_ensure = 'present' ) { @@ -67,6 +72,7 @@ class neutron::plugins::ml2::arista( 'ml2_arista/eapi_password': value => $eapi_password, secret => true; 'ml2_arista/region_name' : value => $region_name; 'ml2_arista/sync_interval': value => $sync_interval; + 'ml2_arista/conn_timeout' : value => $conn_timeout; 'ml2_arista/use_fqdn' : value => $use_fqdn; } diff --git a/manifests/plugins/ml2/arista/l3.pp b/manifests/plugins/ml2/arista/l3.pp index d8cae6cae..13758d219 100644 --- a/manifests/plugins/ml2/arista/l3.pp +++ b/manifests/plugins/ml2/arista/l3.pp @@ -20,31 +20,35 @@ # === Parameters # # [*primary_l3_host*] -# (required) The Arista EOS IP address. +# (required) The Arista EOS IP address. # # [*primary_l3_host_username*] -# (required) The Arista EOS username. +# (required) The Arista EOS username. # # [*primary_l3_host_password*] -# (required) The Arista EOS password. +# (required) The Arista EOS password. # # [*secondary_l3_host*] -# (optional) The Arist EOS IP address for second switch MLAGed -# with the first one. Only required if $mlag_config is set to true. -# Defaults to $::os_service_default +# (optional) The Arist EOS IP address for second switch MLAGed +# with the first one. Only required if $mlag_config is set to true. +# Defaults to $::os_service_default # # [*mlag_config*] -# (optional) Indicates that the switch is in MLAG mode. -# Defaults to $::os_service_default +# (optional) Indicates that the switch is in MLAG mode. +# Defaults to $::os_service_default # # [*l3_sync_interval*] -# (optional) Sync interval in seconds between l3 service plugin and -# the EOS. -# Defaults to $::os_service_default +# (optional) Sync interval in seconds between l3 service plugin and +# the EOS. +# Defaults to $::os_service_default +# +# [*conn_timeout*] +# (optional) Connection timeout interval in seconds. +# Defaults to $::os_service_default # # [*use_vrf*] -# (optional) If it should create a router in VRF. -# Defaults to $::os_service_default +# (optional) If it should create a router in VRF. +# Defaults to $::os_service_default # class neutron::plugins::ml2::arista::l3( $primary_l3_host, @@ -53,8 +57,8 @@ class neutron::plugins::ml2::arista::l3( $secondary_l3_host = $::os_service_default, $mlag_config = $::os_service_default, $l3_sync_interval = $::os_service_default, - $use_vrf = $::os_service_default - + $conn_timeout = $::os_service_default, + $use_vrf = $::os_service_default, ) { include neutron::deps @@ -74,6 +78,7 @@ class neutron::plugins::ml2::arista::l3( 'l3_arista/secondary_l3_host' : value => $secondary_l3_host; 'l3_arista/mlag_config' : value => $mlag_config; 'l3_arista/l3_sync_interval' : value => $l3_sync_interval; + 'l3_arista/conn_timeout' : value => $conn_timeout; 'l3_arista/use_vrf' : value => $use_vrf; } } diff --git a/releasenotes/notes/arista-conn_timeout-3669015540718e5a.yaml b/releasenotes/notes/arista-conn_timeout-3669015540718e5a.yaml new file mode 100644 index 000000000..0d23eec2f --- /dev/null +++ b/releasenotes/notes/arista-conn_timeout-3669015540718e5a.yaml @@ -0,0 +1,6 @@ +--- +features: + - | + The ``neutron::plugins::ml2::arista`` class and + the ``neutron::plugins::ml2::arista::l3`` class now support the new + ``conn_timeout`` parameter. diff --git a/spec/classes/neutron_plugins_ml2_arista_l3_spec.rb b/spec/classes/neutron_plugins_ml2_arista_l3_spec.rb index 546c30e15..b1b855e9e 100644 --- a/spec/classes/neutron_plugins_ml2_arista_l3_spec.rb +++ b/spec/classes/neutron_plugins_ml2_arista_l3_spec.rb @@ -34,6 +34,7 @@ describe 'neutron::plugins::ml2::arista::l3' do :secondary_l3_host => '', :mlag_config => '', :l3_sync_interval => '', + :conn_timeout => '', :use_vrf => '' } end @@ -57,6 +58,7 @@ describe 'neutron::plugins::ml2::arista::l3' do should contain_neutron_plugin_ml2('l3_arista/secondary_l3_host').with_value(p[:secondary_l3_host]) should contain_neutron_plugin_ml2('l3_arista/mlag_config').with_value(p[:mlag_config]) should contain_neutron_plugin_ml2('l3_arista/l3_sync_interval').with_value(p[:l3_sync_interval]) + should contain_neutron_plugin_ml2('l3_arista/conn_timeout').with_value(p[:conn_timeout]) should contain_neutron_plugin_ml2('l3_arista/use_vrf').with_value(p[:use_vrf]) end diff --git a/spec/classes/neutron_plugins_ml2_arista_spec.rb b/spec/classes/neutron_plugins_ml2_arista_spec.rb index b62b2d950..58c8d5638 100644 --- a/spec/classes/neutron_plugins_ml2_arista_spec.rb +++ b/spec/classes/neutron_plugins_ml2_arista_spec.rb @@ -33,6 +33,7 @@ describe 'neutron::plugins::ml2::arista' do { :region_name => '', :sync_interval => '', + :conn_timeout => '', :use_fqdn => '' } end @@ -55,6 +56,7 @@ describe 'neutron::plugins::ml2::arista' do should contain_neutron_plugin_ml2('ml2_arista/eapi_password').with_value(p[:eapi_password]).with_secret(true) should contain_neutron_plugin_ml2('ml2_arista/region_name').with_value(p[:region_name]) should contain_neutron_plugin_ml2('ml2_arista/sync_interval').with_value(p[:sync_interval]) + should contain_neutron_plugin_ml2('ml2_arista/conn_timeout').with_value(p[:conn_timeout]) should contain_neutron_plugin_ml2('ml2_arista/use_fqdn').with_value(p[:use_fqdn]) end