diff --git a/manifests/agents/l2gw.pp b/manifests/agents/l2gw.pp
index cfd7ddedd..700ae70ea 100644
--- a/manifests/agents/l2gw.pp
+++ b/manifests/agents/l2gw.pp
@@ -56,7 +56,7 @@
 #
 # [*socket_timeout*]
 #   (optional) socket timeout
-#   Defaults to 30
+#   Defaults to $facts['os_service_default']
 #
 # [*purge_config*]
 #   (optional) Whether to set only the specified config options
@@ -76,7 +76,7 @@ class neutron::agents::l2gw (
   $l2_gw_agent_ca_cert_base_path    = $facts['os_service_default'],
   $periodic_interval                = $facts['os_service_default'],
   $max_connection_retries           = $facts['os_service_default'],
-  $socket_timeout                   = 30,
+  $socket_timeout                   = $facts['os_service_default'],
   Boolean $purge_config             = false,
 ) {
   include neutron::deps
diff --git a/releasenotes/notes/l2gw-use-default-max_connection_retries-366d9f8b5b4bff1f.yaml b/releasenotes/notes/l2gw-use-default-max_connection_retries-366d9f8b5b4bff1f.yaml
new file mode 100644
index 000000000..6c7012e83
--- /dev/null
+++ b/releasenotes/notes/l2gw-use-default-max_connection_retries-366d9f8b5b4bff1f.yaml
@@ -0,0 +1,7 @@
+---
+upgrade:
+  - |
+    The ``neutron::agents::l2gw::max_connection_retries`` parameter now
+    defaults to the ``os_service_default`` fact, which uses the internal
+    default value of the networking-l2gw plugin. Set this parameter in case
+    the previous default value ( ``30`` ) is desired.
diff --git a/spec/classes/neutron_agents_l2gw_spec.rb b/spec/classes/neutron_agents_l2gw_spec.rb
index d7c4d2ecb..6e37c7701 100644
--- a/spec/classes/neutron_agents_l2gw_spec.rb
+++ b/spec/classes/neutron_agents_l2gw_spec.rb
@@ -19,9 +19,7 @@ require 'spec_helper'
 describe 'neutron::agents::l2gw' do
   let :default_params do
     { :package_ensure => 'present',
-      :purge_config   => false,
       :enabled        => true,
-      :socket_timeout => '30',
     }
   end
 
@@ -56,7 +54,7 @@ describe 'neutron::agents::l2gw' do
       should contain_neutron_l2gw_agent_config('ovsdb/l2_gw_agent_ca_cert_base_path').with_value('<SERVICE DEFAULT>')
       should contain_neutron_l2gw_agent_config('ovsdb/periodic_interval').with_value('<SERVICE DEFAULT>')
       should contain_neutron_l2gw_agent_config('ovsdb/max_connection_retries').with_value('<SERVICE DEFAULT>')
-      should contain_neutron_l2gw_agent_config('ovsdb/socket_timeout').with_value(p[:socket_timeout])
+      should contain_neutron_l2gw_agent_config('ovsdb/socket_timeout').with_value('<SERVICE DEFAULT>')
       should contain_neutron_l2gw_agent_config('ovsdb/ovsdb_hosts').with_value('<SERVICE DEFAULT>')
     end