diff --git a/manifests/agents/l2gw.pp b/manifests/agents/l2gw.pp
index 464a0eff3..cfd7ddedd 100644
--- a/manifests/agents/l2gw.pp
+++ b/manifests/agents/l2gw.pp
@@ -27,41 +27,36 @@
 #
 # [*enable_manager*]
 #   (optional) connection can be initiated by the ovsdb server.
-#   Defaults to false
+#   Defaults to $facts['os_service_default']
 #
 # [*manager_table_listening_port*]
 #   (optional) set port number for l2gateway agent, so that it can listen
-#   Defaults to '6632'
+#   Defaults to $facts['os_service_default']
 #
 # [*l2_gw_agent_priv_key_base_path*]
 #   (optional) Base path to private key file(s).
-#   Example: l2_gw_agent_priv_key_base_path = '/home/someuser/keys'
 #   Defaults to $facts['os_service_default']
 #
 # [*l2_gw_agent_cert_base_path*]
 #   (optional) Base path to cert file(s).
-#   Example: l2_gw_agent_cert_base_path = '/home/someuser/certs'
 #   Defaults to $facts['os_service_default']
 #
 # [*l2_gw_agent_ca_cert_base_path*]
 #   (optional) Base path to ca cert file(s).
-#   Example: l2_gw_agent_ca_cert_base_path = '/home/someuser/ca_certs'
 #   Defaults to $facts['os_service_default']
 #
 # [*periodic_interval*]
 #   (optional) The L2 gateway agent checks connection state with the OVSDB
 #   servers. The interval is number of seconds between attempts.
-#   Example: periodic_interval = 20
 #   Defaults to $facts['os_service_default']
 #
 # [*max_connection_retries*]
 #   (optional) The L2 gateway agent retries to connect to the OVSDB server
-#   Example: max_connection_retries = 10
 #   Defaults to $facts['os_service_default']
 #
 # [*socket_timeout*]
 #   (optional) socket timeout
-#   Defaults to '30'
+#   Defaults to 30
 #
 # [*purge_config*]
 #   (optional) Whether to set only the specified config options
@@ -74,14 +69,14 @@ class neutron::agents::l2gw (
   Boolean $manage_service           = true,
   $debug                            = $facts['os_service_default'],
   $ovsdb_hosts                      = $facts['os_service_default'],
-  $enable_manager                   = false,
-  $manager_table_listening_port     = '6632',
+  $enable_manager                   = $facts['os_service_default'],
+  $manager_table_listening_port     = $facts['os_service_default'],
   $l2_gw_agent_priv_key_base_path   = $facts['os_service_default'],
   $l2_gw_agent_cert_base_path       = $facts['os_service_default'],
   $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                   = 30,
   Boolean $purge_config             = false,
 ) {
   include neutron::deps
diff --git a/spec/classes/neutron_agents_l2gw_spec.rb b/spec/classes/neutron_agents_l2gw_spec.rb
index 3610fd2c4..d7c4d2ecb 100644
--- a/spec/classes/neutron_agents_l2gw_spec.rb
+++ b/spec/classes/neutron_agents_l2gw_spec.rb
@@ -18,12 +18,10 @@ require 'spec_helper'
 
 describe 'neutron::agents::l2gw' do
   let :default_params do
-    { :package_ensure                   => 'present',
-      :purge_config                     => false,
-      :enabled                          => true,
-      :enable_manager                   => false,
-      :manager_table_listening_port     => '6632',
-      :socket_timeout                   => '30',
+    { :package_ensure => 'present',
+      :purge_config   => false,
+      :enabled        => true,
+      :socket_timeout => '30',
     }
   end
 
@@ -51,8 +49,8 @@ describe 'neutron::agents::l2gw' do
 
     it 'configures networking_l2gw.conf' do
       should contain_neutron_l2gw_agent_config('DEFAULT/debug').with_value('<SERVICE DEFAULT>')
-      should contain_neutron_l2gw_agent_config('ovsdb/enable_manager').with_value(p[:enable_manager])
-      should contain_neutron_l2gw_agent_config('ovsdb/manager_table_listening_port').with_value(p[:manager_table_listening_port])
+      should contain_neutron_l2gw_agent_config('ovsdb/enable_manager').with_value('<SERVICE DEFAULT>')
+      should contain_neutron_l2gw_agent_config('ovsdb/manager_table_listening_port').with_value('<SERVICE DEFAULT>')
       should contain_neutron_l2gw_agent_config('ovsdb/l2_gw_agent_priv_key_base_path').with_value('<SERVICE DEFAULT>')
       should contain_neutron_l2gw_agent_config('ovsdb/l2_gw_agent_cert_base_path').with_value('<SERVICE DEFAULT>')
       should contain_neutron_l2gw_agent_config('ovsdb/l2_gw_agent_ca_cert_base_path').with_value('<SERVICE DEFAULT>')