diff --git a/examples/neutron.pp b/examples/neutron.pp
index 1b90a8ce6..a9a1b8d93 100644
--- a/examples/neutron.pp
+++ b/examples/neutron.pp
@@ -4,7 +4,7 @@
 # Configures everything in neutron.conf
 class { 'neutron':
   default_transport_url => 'rabbit://guest:password@localhost:5672/neutron',
-  service_plugins       => ['metering']
+  service_plugins       => ['metering'],
 }
 
 # The API server talks to keystone for authorisation
@@ -29,7 +29,7 @@ class { 'neutron::agents::metering': }
 # Agent
 class { 'neutron::agents::ml2::ovs':
   local_ip     => '192.168.1.1',
-  tunnel_types => ['vxlan']
+  tunnel_types => ['vxlan'],
 }
 
 # ml2 plugin with vxlan as ml2 driver and ovs as mechanism driver
@@ -38,7 +38,7 @@ class { 'neutron::plugins::ml2':
   tenant_network_types => ['vxlan'],
   vxlan_group          => '239.1.1.1',
   mechanism_drivers    => ['openvswitch'],
-  vni_ranges           => ['0:300']
+  vni_ranges           => ['0:300'],
 }
 
 ### Compute Nodes:
@@ -52,5 +52,5 @@ class { 'neutron':
 # Agent
 class { 'neutron::agents::ml2::ovs':
   local_ip     => '192.168.1.11',
-  tunnel_types => ['vxlan']
+  tunnel_types => ['vxlan'],
 }
diff --git a/examples/neutron_with_pacemaker.pp b/examples/neutron_with_pacemaker.pp
index e3b7c9df4..6f92ceafd 100644
--- a/examples/neutron_with_pacemaker.pp
+++ b/examples/neutron_with_pacemaker.pp
@@ -23,7 +23,7 @@
 # sudo pcs constraint colocation add neutron_server_service with neutron_vip
 
 class { 'neutron':
-  service_plugins => [ 'dhcp', 'l3' ]
+  service_plugins => [ 'dhcp', 'l3' ],
 }
 
 class { 'neutron::server':
diff --git a/manifests/agents/bagpipe.pp b/manifests/agents/bagpipe.pp
index eba901d77..8834e0420 100644
--- a/manifests/agents/bagpipe.pp
+++ b/manifests/agents/bagpipe.pp
@@ -98,7 +98,7 @@ class neutron::agents::bagpipe (
   include neutron::deps
   include neutron::params
 
-  if ! $::neutron::params::bagpipe_bgp_package {
+  if ! $neutron::params::bagpipe_bgp_package {
     fail('BaGPipe agent is currently unsupported in this operating system.')
   }
 
@@ -121,8 +121,8 @@ class neutron::agents::bagpipe (
 
   package { 'bagpipe-bgp':
     ensure => $package_ensure,
-    name   => $::neutron::params::bagpipe_bgp_package,
-    tag    => ['openstack', 'neutron-plugin-ml2-package']
+    name   => $neutron::params::bagpipe_bgp_package,
+    tag    => ['openstack', 'neutron-plugin-ml2-package'],
   }
 
   if $manage_service {
@@ -133,7 +133,7 @@ class neutron::agents::bagpipe (
     }
     service { 'bagpipe-bgp':
       ensure => $service_ensure,
-      name   => $::neutron::params::bagpipe_bgp_service,
+      name   => $neutron::params::bagpipe_bgp_service,
       enable => $enabled,
       tag    => 'neutron-service',
     }
diff --git a/manifests/agents/bgp_dragent.pp b/manifests/agents/bgp_dragent.pp
index 1563b9d3a..2c8cf4ca1 100644
--- a/manifests/agents/bgp_dragent.pp
+++ b/manifests/agents/bgp_dragent.pp
@@ -68,7 +68,7 @@ class neutron::agents::bgp_dragent(
 
   package { 'neutron-bgp-dragent':
     ensure => $package_ensure,
-    name   => $::neutron::params::bgp_dragent_package,
+    name   => $neutron::params::bgp_dragent_package,
     tag    => ['openstack', 'neutron-package'],
   }
 
@@ -80,7 +80,7 @@ class neutron::agents::bgp_dragent(
     }
     service { 'neutron-bgp-dragent':
       ensure => $service_ensure,
-      name   => $::neutron::params::bgp_dragent_service,
+      name   => $neutron::params::bgp_dragent_service,
       enable => $enabled,
       tag    => 'neutron-service',
     }
diff --git a/manifests/agents/dhcp.pp b/manifests/agents/dhcp.pp
index a4db3c488..35b4f3776 100644
--- a/manifests/agents/dhcp.pp
+++ b/manifests/agents/dhcp.pp
@@ -205,7 +205,7 @@ class neutron::agents::dhcp (
     $req_ssl_opts = {
       'ovsdb_agent_ssl_key_file'  => $ovsdb_agent_ssl_key_file,
       'ovsdb_agent_ssl_cert_file' => $ovsdb_agent_ssl_cert_file,
-      'ovsdb_agent_ssl_ca_file'   => $ovsdb_agent_ssl_ca_file
+      'ovsdb_agent_ssl_ca_file'   => $ovsdb_agent_ssl_ca_file,
     }
     $req_ssl_opts.each |$opts| {
       if !$opts[1] or is_service_default($opts[1]) {
@@ -225,10 +225,10 @@ class neutron::agents::dhcp (
     'ovs/ssl_ca_cert_file':   value => $ovsdb_agent_ssl_ca_file;
   }
 
-  if $::neutron::params::dhcp_agent_package {
+  if $neutron::params::dhcp_agent_package {
     package { 'neutron-dhcp-agent':
       ensure => $package_ensure,
-      name   => $::neutron::params::dhcp_agent_package,
+      name   => $neutron::params::dhcp_agent_package,
       tag    => ['openstack', 'neutron-package'],
     }
   }
@@ -241,7 +241,7 @@ class neutron::agents::dhcp (
     }
     service { 'neutron-dhcp-service':
       ensure => $service_ensure,
-      name   => $::neutron::params::dhcp_agent_service,
+      name   => $neutron::params::dhcp_agent_service,
       enable => $enabled,
       tag    => 'neutron-service',
     }
diff --git a/manifests/agents/fwaas.pp b/manifests/agents/fwaas.pp
index a20c86fc5..721116ade 100644
--- a/manifests/agents/fwaas.pp
+++ b/manifests/agents/fwaas.pp
@@ -63,7 +63,7 @@ class neutron::agents::fwaas (
 
   ensure_packages( 'neutron-fwaas', {
     'ensure' => $package_ensure,
-    'name'   => $::neutron::params::fwaas_package,
+    'name'   => $neutron::params::fwaas_package,
     'tag'    => ['openstack', 'neutron-package'],
   })
 }
diff --git a/manifests/agents/l2gw.pp b/manifests/agents/l2gw.pp
index 713bbd27c..20206f83b 100644
--- a/manifests/agents/l2gw.pp
+++ b/manifests/agents/l2gw.pp
@@ -106,10 +106,10 @@ class neutron::agents::l2gw (
     'ovsdb/periodic_interval':                  value => $periodic_interval;
   }
 
-  if $::neutron::params::l2gw_agent_package {
+  if $neutron::params::l2gw_agent_package {
     package { 'neutron-l2gw-agent':
       ensure => $package_ensure,
-      name   => $::neutron::params::l2gw_agent_package,
+      name   => $neutron::params::l2gw_agent_package,
       tag    => ['openstack', 'neutron-package'],
     }
   }
@@ -122,7 +122,7 @@ class neutron::agents::l2gw (
     }
     service { 'neutron-l2gw-agent':
       ensure => $service_ensure,
-      name   => $::neutron::params::l2gw_agent_service,
+      name   => $neutron::params::l2gw_agent_service,
       enable => $enabled,
       tag    => 'neutron-service',
     }
diff --git a/manifests/agents/l3.pp b/manifests/agents/l3.pp
index 6866b57eb..19072ee46 100644
--- a/manifests/agents/l3.pp
+++ b/manifests/agents/l3.pp
@@ -262,10 +262,10 @@ class neutron::agents::l3 (
     'network_log/local_output_log_base':                 value => $network_log_local_output_log_base;
   }
 
-  if $::neutron::params::l3_agent_package {
+  if $neutron::params::l3_agent_package {
     package { 'neutron-l3':
       ensure => $package_ensure,
-      name   => $::neutron::params::l3_agent_package,
+      name   => $neutron::params::l3_agent_package,
       tag    => ['openstack', 'neutron-package'],
     }
   }
@@ -278,7 +278,7 @@ class neutron::agents::l3 (
     }
     service { 'neutron-l3':
       ensure => $service_ensure,
-      name   => $::neutron::params::l3_agent_service,
+      name   => $neutron::params::l3_agent_service,
       enable => $enabled,
       tag    => 'neutron-service',
     }
diff --git a/manifests/agents/metadata.pp b/manifests/agents/metadata.pp
index 486c55440..961a4f6ff 100644
--- a/manifests/agents/metadata.pp
+++ b/manifests/agents/metadata.pp
@@ -119,10 +119,10 @@ class neutron::agents::metadata (
     'DEFAULT/rpc_response_max_timeout':       value => $rpc_response_max_timeout;
   }
 
-  if $::neutron::params::metadata_agent_package {
+  if $neutron::params::metadata_agent_package {
     package { 'neutron-metadata':
       ensure => $package_ensure,
-      name   => $::neutron::params::metadata_agent_package,
+      name   => $neutron::params::metadata_agent_package,
       tag    => ['openstack', 'neutron-package'],
     }
   }
@@ -135,7 +135,7 @@ class neutron::agents::metadata (
     }
     service { 'neutron-metadata':
       ensure => $service_ensure,
-      name   => $::neutron::params::metadata_agent_service,
+      name   => $neutron::params::metadata_agent_service,
       enable => $enabled,
       tag    => 'neutron-service',
     }
diff --git a/manifests/agents/metering.pp b/manifests/agents/metering.pp
index b51c1c016..d26869da0 100644
--- a/manifests/agents/metering.pp
+++ b/manifests/agents/metering.pp
@@ -99,10 +99,10 @@ class neutron::agents::metering (
     'agent/report_interval':            value => $agent_report_interval;
   }
 
-  if $::neutron::params::metering_agent_package {
+  if $neutron::params::metering_agent_package {
     package { 'neutron-metering-agent':
       ensure => $package_ensure,
-      name   => $::neutron::params::metering_agent_package,
+      name   => $neutron::params::metering_agent_package,
       tag    => ['openstack', 'neutron-package'],
     }
   }
@@ -115,7 +115,7 @@ class neutron::agents::metering (
     }
     service { 'neutron-metering-service':
       ensure => $service_ensure,
-      name   => $::neutron::params::metering_agent_service,
+      name   => $neutron::params::metering_agent_service,
       enable => $enabled,
       tag    => 'neutron-service',
     }
diff --git a/manifests/agents/ml2/macvtap.pp b/manifests/agents/ml2/macvtap.pp
index 10c7af813..c9c584973 100644
--- a/manifests/agents/ml2/macvtap.pp
+++ b/manifests/agents/ml2/macvtap.pp
@@ -65,7 +65,7 @@ class neutron::agents::ml2::macvtap (
 
   package { 'neutron-plugin-macvtap-agent':
     ensure => $package_ensure,
-    name   => $::neutron::params::macvtap_agent_package,
+    name   => $neutron::params::macvtap_agent_package,
     tag    => ['openstack', 'neutron-package'],
   }
 
@@ -77,7 +77,7 @@ class neutron::agents::ml2::macvtap (
     }
     service { 'neutron-plugin-macvtap-agent':
       ensure => $service_ensure,
-      name   => $::neutron::params::macvtap_agent_service,
+      name   => $neutron::params::macvtap_agent_service,
       enable => $enabled,
       tag    => 'neutron-service',
     }
diff --git a/manifests/agents/ml2/networking_baremetal.pp b/manifests/agents/ml2/networking_baremetal.pp
index f093f55e1..9f8aaf6e7 100644
--- a/manifests/agents/ml2/networking_baremetal.pp
+++ b/manifests/agents/ml2/networking_baremetal.pp
@@ -163,7 +163,7 @@ class neutron::agents::ml2::networking_baremetal (
 
   package { 'python-ironic-neutron-agent':
     ensure => $package_ensure,
-    name   => $::neutron::params::networking_baremetal_agent_package,
+    name   => $neutron::params::networking_baremetal_agent_package,
     tag    => ['openstack', 'neutron-package'],
   }
 
@@ -175,7 +175,7 @@ class neutron::agents::ml2::networking_baremetal (
     }
     service { 'ironic-neutron-agent-service':
       ensure => $service_ensure,
-      name   => $::neutron::params::networking_baremetal_agent_service,
+      name   => $neutron::params::networking_baremetal_agent_service,
       enable => $enabled,
       tag    => 'neutron-service',
     }
diff --git a/manifests/agents/ml2/ovn.pp b/manifests/agents/ml2/ovn.pp
index 6cf0a6f6a..6708c262e 100644
--- a/manifests/agents/ml2/ovn.pp
+++ b/manifests/agents/ml2/ovn.pp
@@ -160,7 +160,7 @@ class neutron::agents::ml2::ovn (
 
   package { 'neutron-ovn-agent':
     ensure => $package_ensure,
-    name   => $::neutron::params::ovn_agent_package,
+    name   => $neutron::params::ovn_agent_package,
     tag    => ['openstack', 'neutron-package'],
   }
 
@@ -172,7 +172,7 @@ class neutron::agents::ml2::ovn (
     }
     service { 'neutron-ovn-agent':
       ensure => $service_ensure,
-      name   => $::neutron::params::ovn_agent_service,
+      name   => $neutron::params::ovn_agent_service,
       enable => $enabled,
       tag    => 'neutron-service',
     }
diff --git a/manifests/agents/ml2/ovs.pp b/manifests/agents/ml2/ovs.pp
index afe272c99..31e56f9aa 100644
--- a/manifests/agents/ml2/ovs.pp
+++ b/manifests/agents/ml2/ovs.pp
@@ -420,7 +420,7 @@ class neutron::agents::ml2::ovs (
     }
 
     neutron_agent_ovs {
-      'ovs/bridge_mappings': ensure => absent
+      'ovs/bridge_mappings': ensure => absent;
     }
   }
 
@@ -566,7 +566,7 @@ class neutron::agents::ml2::ovs (
 
   package { 'neutron-ovs-agent':
     ensure => $package_ensure,
-    name   => $::neutron::params::ovs_agent_package,
+    name   => $neutron::params::ovs_agent_package,
     tag    => ['openstack', 'neutron-package'],
   }
 
@@ -579,32 +579,32 @@ class neutron::agents::ml2::ovs (
 
     service { 'neutron-ovs-agent-service':
       ensure => $service_ensure,
-      name   => $::neutron::params::ovs_agent_service,
+      name   => $neutron::params::ovs_agent_service,
       enable => $enabled,
       tag    => ['neutron-service'],
     }
     Neutron_agent_ovs<||> ~> Service['neutron-ovs-agent-service']
 
-    if $::neutron::params::destroy_patch_ports_service {
+    if $neutron::params::destroy_patch_ports_service {
       # NOTE(tkajinam): The service should not be started in a running system.
       #                 DO NOT define ensure so the service status is not
       #                 changed.
       service { 'neutron-destroy-patch-ports-service':
-        name    => $::neutron::params::destroy_patch_ports_service,
+        name    => $neutron::params::destroy_patch_ports_service,
         enable  => $enabled,
         require => Anchor['neutron::service::begin'],
-        before  => Anchor['neutron::service::end']
+        before  => Anchor['neutron::service::end'],
       }
     }
 
-    if $::neutron::params::ovs_cleanup_service {
+    if $neutron::params::ovs_cleanup_service {
       # NOTE(tkajinam): This service should not be restarted, because it can
       #                 cause disruption of network connectivity.
       service { 'ovs-cleanup-service':
-        name    => $::neutron::params::ovs_cleanup_service,
+        name    => $neutron::params::ovs_cleanup_service,
         enable  => $enabled,
         require => Anchor['neutron::service::begin'],
-        before  => Anchor['neutron::service::end']
+        before  => Anchor['neutron::service::end'],
       }
     }
   }
diff --git a/manifests/agents/ml2/sriov.pp b/manifests/agents/ml2/sriov.pp
index 8bbffaa1e..94c8ad7d6 100644
--- a/manifests/agents/ml2/sriov.pp
+++ b/manifests/agents/ml2/sriov.pp
@@ -140,7 +140,7 @@ class neutron::agents::ml2::sriov (
 
   package { 'neutron-sriov-nic-agent':
     ensure => $package_ensure,
-    name   => $::neutron::params::sriov_nic_agent_package,
+    name   => $neutron::params::sriov_nic_agent_package,
     tag    => ['openstack', 'neutron-package'],
   }
 
@@ -152,7 +152,7 @@ class neutron::agents::ml2::sriov (
     }
     service { 'neutron-sriov-nic-agent-service':
       ensure => $service_ensure,
-      name   => $::neutron::params::sriov_nic_agent_service,
+      name   => $neutron::params::sriov_nic_agent_service,
       enable => $enabled,
       tag    => 'neutron-service',
     }
diff --git a/manifests/agents/ovn_metadata.pp b/manifests/agents/ovn_metadata.pp
index 6a0af518b..fd6cf2596 100644
--- a/manifests/agents/ovn_metadata.pp
+++ b/manifests/agents/ovn_metadata.pp
@@ -184,10 +184,10 @@ class neutron::agents::ovn_metadata (
     'ovn/ovn_sb_ca_cert':                     value => $ovn_sb_ca_cert;
   }
 
-  if $::neutron::params::ovn_metadata_agent_package {
+  if $neutron::params::ovn_metadata_agent_package {
     package { 'ovn-metadata':
       ensure => $package_ensure,
-      name   => $::neutron::params::ovn_metadata_agent_package,
+      name   => $neutron::params::ovn_metadata_agent_package,
       tag    => ['openstack', 'neutron-package'],
     }
   }
@@ -200,7 +200,7 @@ class neutron::agents::ovn_metadata (
     }
     service { 'ovn-metadata':
       ensure => $service_ensure,
-      name   => $::neutron::params::ovn_metadata_agent_service,
+      name   => $neutron::params::ovn_metadata_agent_service,
       enable => $enabled,
       tag    => 'neutron-service',
     }
diff --git a/manifests/agents/taas.pp b/manifests/agents/taas.pp
index 640009a17..c03f9a04a 100644
--- a/manifests/agents/taas.pp
+++ b/manifests/agents/taas.pp
@@ -40,7 +40,7 @@ class neutron::agents::taas (
 
   stdlib::ensure_packages( 'neutron-taas', {
     'ensure' => $package_ensure,
-    'name'   => $::neutron::params::taas_package,
+    'name'   => $neutron::params::taas_package,
     'tag'    => ['openstack', 'neutron-package'],
   })
 }
diff --git a/manifests/agents/vpnaas.pp b/manifests/agents/vpnaas.pp
index d09637f1b..61c296c34 100644
--- a/manifests/agents/vpnaas.pp
+++ b/manifests/agents/vpnaas.pp
@@ -60,7 +60,7 @@ openswan package in distributions")
       Package['libreswan'] -> Package<| title == 'neutron-vpnaas-agent' |>
       stdlib::ensure_packages( 'libreswan', {
         'ensure' => present,
-        'name'   => $::neutron::params::libreswan_package,
+        'name'   => $neutron::params::libreswan_package,
         'tag'    => ['openstack', 'neutron-support-package'],
       })
     }
@@ -68,7 +68,7 @@ openswan package in distributions")
       Package['strongswan'] -> Package<| title == 'neutron-vpnaas-agent' |>
       stdlib::ensure_packages( 'strongswan', {
         'ensure' => present,
-        'name'   => $::neutron::params::strongswan_package,
+        'name'   => $neutron::params::strongswan_package,
         'tag'    => ['openstack', 'neutron-support-package'],
       })
     }
@@ -96,7 +96,7 @@ openswan package in distributions")
 
   stdlib::ensure_packages( 'neutron-vpnaas-agent', {
     'ensure' => $package_ensure,
-    'name'   => $::neutron::params::vpnaas_agent_package,
+    'name'   => $neutron::params::vpnaas_agent_package,
     'tag'    => ['openstack', 'neutron-package'],
   })
 }
diff --git a/manifests/agents/vpnaas/ovn.pp b/manifests/agents/vpnaas/ovn.pp
index c4f709396..f255ba618 100644
--- a/manifests/agents/vpnaas/ovn.pp
+++ b/manifests/agents/vpnaas/ovn.pp
@@ -114,14 +114,14 @@ openswan package in distributions")
     /\.OvnLibreSwanDriver$/: {
       stdlib::ensure_packages( 'libreswan', {
         'ensure' => present,
-        'name'   => $::neutron::params::libreswan_package,
+        'name'   => $neutron::params::libreswan_package,
         'tag'    => ['openstack', 'neutron-support-package'],
       })
     }
     /\.OvnStrongSwanDriver$/: {
       stdlib::ensure_packages( 'strongswan', {
         'ensure' => present,
-        'name'   => $::neutron::params::strongswan_package,
+        'name'   => $neutron::params::strongswan_package,
         'tag'    => ['openstack', 'neutron-support-package'],
       })
     }
@@ -155,7 +155,7 @@ openswan package in distributions")
 
   stdlib::ensure_packages( 'neutron-vpnaas-ovn-vpn-agent', {
     'ensure' => $package_ensure,
-    'name'   => $::neutron::params::vpnaas_ovn_vpn_agent_package,
+    'name'   => $neutron::params::vpnaas_ovn_vpn_agent_package,
     'tag'    => ['openstack', 'neutron-package'],
   })
 
@@ -167,7 +167,7 @@ openswan package in distributions")
     }
     service { 'neutron-vpnaas-ovn-vpn-agent':
       ensure => $service_ensure,
-      name   => $::neutron::params::vpnaas_ovn_vpn_agent_service,
+      name   => $neutron::params::vpnaas_ovn_vpn_agent_service,
       enable => $enabled,
       tag    => 'neutron-service',
     }
diff --git a/manifests/client.pp b/manifests/client.pp
index fc5c86d7d..3aea036d3 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -20,7 +20,7 @@ in a future release.")
 
   package { 'python-neutronclient':
     ensure => $package_ensure,
-    name   => $::neutron::params::client_package,
+    name   => $neutron::params::client_package,
     tag    => 'openstack',
   }
 
diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp
index 90e44b134..17189af06 100644
--- a/manifests/db/sync.pp
+++ b/manifests/db/sync.pp
@@ -26,7 +26,7 @@ class neutron::db::sync(
     command     => "neutron-db-manage ${extra_params} upgrade heads",
     path        => '/usr/bin',
     refreshonly => true,
-    user        => $::neutron::params::user,
+    user        => $neutron::params::user,
     try_sleep   => 5,
     tries       => 10,
     timeout     => $db_sync_timeout,
diff --git a/manifests/init.pp b/manifests/init.pp
index 18e839c3c..c7d8e81a2 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -389,7 +389,7 @@ will be removed in a future release")
 
   package { 'neutron':
     ensure => $package_ensure,
-    name   => $::neutron::params::package_name,
+    name   => $neutron::params::package_name,
     tag    => ['openstack', 'neutron-package'],
   }
 
@@ -437,7 +437,7 @@ will be removed in a future release")
   }
 
   neutron_config {
-    'DEFAULT/service_plugins': value => join(any2array($service_plugins), ',')
+    'DEFAULT/service_plugins': value => join(any2array($service_plugins), ',');
   }
 
   oslo::messaging::rabbit {'neutron_config':
diff --git a/manifests/plugins/ml2.pp b/manifests/plugins/ml2.pp
index a01e7e750..625068279 100644
--- a/manifests/plugins/ml2.pp
+++ b/manifests/plugins/ml2.pp
@@ -156,17 +156,17 @@ class neutron::plugins::ml2 (
 
   # In RH, the link is used to start Neutron process but in Debian, it's used only
   # to manage database synchronization.
-  file {'/etc/neutron/plugin.ini':
+  file { '/etc/neutron/plugin.ini':
     ensure => link,
     target => '/etc/neutron/plugins/ml2/ml2_conf.ini',
     tag    => 'neutron-config-file',
   }
 
   # Some platforms do not have a dedicated ml2 plugin package
-  if $::neutron::params::ml2_server_package {
+  if $neutron::params::ml2_server_package {
     package { 'neutron-plugin-ml2':
       ensure => $package_ensure,
-      name   => $::neutron::params::ml2_server_package,
+      name   => $neutron::params::ml2_server_package,
       tag    => ['openstack', 'neutron-package'],
     }
   }
@@ -181,7 +181,7 @@ class neutron::plugins::ml2 (
     network_vlan_ranges => $network_vlan_ranges,
     vni_ranges          => $vni_ranges,
     vxlan_group         => $vxlan_group,
-    max_header_size     => $max_header_size
+    max_header_size     => $max_header_size,
   }
 
   neutron_plugin_ml2 {
diff --git a/manifests/plugins/ml2/arista.pp b/manifests/plugins/ml2/arista.pp
index 756bf0c10..250975f33 100644
--- a/manifests/plugins/ml2/arista.pp
+++ b/manifests/plugins/ml2/arista.pp
@@ -78,7 +78,7 @@ class neutron::plugins::ml2::arista(
 
   package { 'python-networking-arista':
     ensure => $package_ensure,
-    name   => $::neutron::params::arista_plugin_package,
+    name   => $neutron::params::arista_plugin_package,
     tag    => ['openstack', 'neutron-plugin-ml2-package'],
   }
 }
diff --git a/manifests/plugins/ml2/bagpipe.pp b/manifests/plugins/ml2/bagpipe.pp
index e937e7191..5689742c9 100644
--- a/manifests/plugins/ml2/bagpipe.pp
+++ b/manifests/plugins/ml2/bagpipe.pp
@@ -50,7 +50,7 @@ class neutron::plugins::ml2::bagpipe (
 
   package { 'python-networking-bagpipe':
     ensure => $package_ensure,
-    name   => $::neutron::params::bgpvpn_bagpipe_package,
-    tag    => ['openstack', 'neutron-plugin-ml2-package']
+    name   => $neutron::params::bgpvpn_bagpipe_package,
+    tag    => ['openstack', 'neutron-plugin-ml2-package'],
   }
 }
diff --git a/manifests/plugins/ml2/networking_baremetal.pp b/manifests/plugins/ml2/networking_baremetal.pp
index 89e1a5905..d8e68a4c0 100644
--- a/manifests/plugins/ml2/networking_baremetal.pp
+++ b/manifests/plugins/ml2/networking_baremetal.pp
@@ -19,7 +19,7 @@ class neutron::plugins::ml2::networking_baremetal(
 
   package { 'python-networking-baremetal':
     ensure => $package_ensure,
-    name   => $::neutron::params::networking_baremetal_package,
+    name   => $neutron::params::networking_baremetal_package,
     tag    => ['openstack', 'neutron-plugin-ml2-package'],
   }
 }
diff --git a/manifests/plugins/ml2/ovn/maintenance_worker.pp b/manifests/plugins/ml2/ovn/maintenance_worker.pp
index 706617042..3b9f8c23b 100644
--- a/manifests/plugins/ml2/ovn/maintenance_worker.pp
+++ b/manifests/plugins/ml2/ovn/maintenance_worker.pp
@@ -24,7 +24,7 @@ class neutron::plugins::ml2::ovn::maintenance_worker (
 
   package { 'neutron-ovn-maintenance-worker':
     ensure => $package_ensure,
-    name   => $::neutron::params::ovn_maintenance_worker_package,
+    name   => $neutron::params::ovn_maintenance_worker_package,
     tag    => ['openstack', 'neutron-package'],
   }
 
@@ -36,7 +36,7 @@ class neutron::plugins::ml2::ovn::maintenance_worker (
     }
     service { 'neutron-ovn-maintenance-worker':
       ensure => $service_ensure,
-      name   => $::neutron::params::ovn_maintenance_worker_service,
+      name   => $neutron::params::ovn_maintenance_worker_service,
       enable => $enabled,
       tag    => 'neutron-service',
     }
diff --git a/manifests/plugins/ovs/bridge.pp b/manifests/plugins/ovs/bridge.pp
index ef6b41bb3..4eecefe9b 100644
--- a/manifests/plugins/ovs/bridge.pp
+++ b/manifests/plugins/ovs/bridge.pp
@@ -8,7 +8,7 @@ define neutron::plugins::ovs::bridge {
 
   vs_bridge {$bridge:
     ensure       => present,
-    external_ids => "bridge-id=${bridge}"
+    external_ids => "bridge-id=${bridge}",
   }
 }
 
diff --git a/manifests/plugins/ovs/port.pp b/manifests/plugins/ovs/port.pp
index b7ef951aa..a0b0a3451 100644
--- a/manifests/plugins/ovs/port.pp
+++ b/manifests/plugins/ovs/port.pp
@@ -6,7 +6,7 @@ define neutron::plugins::ovs::port {
   $mapping = split($name, ':')
   vs_port {$mapping[1]:
     ensure => present,
-    bridge => $mapping[0]
+    bridge => $mapping[0],
   }
 }
 
diff --git a/manifests/policy.pp b/manifests/policy.pp
index c5e19d188..8cae5f4cd 100644
--- a/manifests/policy.pp
+++ b/manifests/policy.pp
@@ -62,7 +62,7 @@ class neutron::policy (
     policies     => $policies,
     policy_path  => $policy_path,
     file_user    => 'root',
-    file_group   => $::neutron::params::group,
+    file_group   => $neutron::params::group,
     file_format  => 'yaml',
     purge_config => $purge_config,
     tag          => 'neutron',
diff --git a/manifests/server.pp b/manifests/server.pp
index 3357ed5f5..eae648a5d 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -25,45 +25,45 @@
 #   to make neutron-api be a web app using apache mod_wsgi.
 #   If set to false, then neutron-server isn't in use, and we will
 #   be using neutron-api and neutron-rpc-server instead.
-#   Defaults to $::neutron::params::server_service
+#   Defaults to $neutron::params::server_service
 #
 # [*server_package*]
 #   (Optional) Name of the package holding neutron-server.
 #   If service_name is set to false, then this also must be
 #   set to false. With false, no package will be installed
 #   before running the neutron-server service.
-#   Defaults to $::neutron::params::server_package
+#   Defaults to $neutron::params::server_package
 #
 # [*api_package_name*]
 #   (Optional) Name of the package holding neutron-api.
 #   If this parameter is set to false,
-#   Default to $::neutron::params::api_package_name
+#   Default to $neutron::params::api_package_name
 #
 # [*api_service_name*]
 #   (Optional) Name of the service for neutron-api.
 #   If service_name is set to false, this parameter must
 #   be set with a value, so that an API server will run.
-#   Defaults to $::neutron::params::api_service_name
+#   Defaults to $neutron::params::api_service_name
 #
 # [*rpc_package_name*]
 #   (Optional) Name of the package for neutron-rpc-server.
-#   Default to $::neutron::params::rpc_package_name
+#   Default to $neutron::params::rpc_package_name
 #
 # [*rpc_service_name*]
 #   (Optional) Name of the service for the RPC listener.
 #   If service_name is set to false, this parameter must
 #   be set with a value, so that an RPC server will run.
-#   Defaults to $::neutron::params::rpc_service_name
+#   Defaults to $neutron::params::rpc_service_name
 #
 # [*periodic_workers_package_name*]
 #   (Optional) Name of the package for neutron-periodic-workers.
-#   Defaults to $::neutron::params::peiodic_workers_package_name
+#   Defaults to $neutron::params::peiodic_workers_package_name
 #
 # [*periodic_workers_service_name*]
 #   (Optional) Name of the service for the periodic workers.
 #   If service_name is set to false, this parameter must
 #   be set with a value, so that an RPC server will run.
-#   Defaults to $::neutron::params::peiodic_workers_service_name
+#   Defaults to $neutron::params::peiodic_workers_service_name
 #
 # [*sync_db*]
 #   (Optional) Run neutron-db-manage on api nodes after installing the package.
@@ -247,14 +247,14 @@ class neutron::server (
   $package_ensure                   = 'present',
   Boolean $enabled                  = true,
   Boolean $manage_service           = true,
-  $service_name                     = $::neutron::params::server_service,
-  $server_package                   = $::neutron::params::server_package,
-  $api_package_name                 = $::neutron::params::api_package_name,
-  $api_service_name                 = $::neutron::params::api_service_name,
-  $rpc_package_name                 = $::neutron::params::rpc_package_name,
-  $rpc_service_name                 = $::neutron::params::rpc_service_name,
-  $periodic_workers_package_name    = $::neutron::params::periodic_workers_package_name,
-  $periodic_workers_service_name    = $::neutron::params::periodic_workers_service_name,
+  $service_name                     = $neutron::params::server_service,
+  $server_package                   = $neutron::params::server_package,
+  $api_package_name                 = $neutron::params::api_package_name,
+  $api_service_name                 = $neutron::params::api_service_name,
+  $rpc_package_name                 = $neutron::params::rpc_package_name,
+  $rpc_service_name                 = $neutron::params::rpc_service_name,
+  $periodic_workers_package_name    = $neutron::params::periodic_workers_package_name,
+  $periodic_workers_service_name    = $neutron::params::periodic_workers_service_name,
   Boolean $sync_db                  = false,
   $api_workers                      = $facts['os_workers'],
   $rpc_workers                      = $facts['os_workers'],
@@ -340,7 +340,7 @@ class neutron::server (
     if $server_package {
       package { 'neutron-server':
         ensure => $package_ensure,
-        name   => $::neutron::params::server_package,
+        name   => $neutron::params::server_package,
         tag    => ['openstack', 'neutron-package'],
       }
     }
@@ -390,10 +390,10 @@ class neutron::server (
     # then we don't need to start neutron-api and neutron-rpc-server. If
     # it is not, then we must start neutron-api and neutron-rpc-server instead.
     if $service_name {
-      if $service_name == $::neutron::params::server_service {
+      if $service_name == $neutron::params::server_service {
         service { 'neutron-server':
           ensure     => $service_ensure,
-          name       => $::neutron::params::server_service,
+          name       => $neutron::params::server_service,
           enable     => $enabled,
           hasstatus  => true,
           hasrestart => true,
@@ -418,12 +418,12 @@ class neutron::server (
       }
 
     } else {
-      if $::neutron::params::server_service {
+      if $neutron::params::server_service {
         # we need to make sure neutron-server is stopped before trying to
         # start separate services.
         service { 'neutron-server':
           ensure     => 'stopped',
-          name       => $::neutron::params::server_service,
+          name       => $neutron::params::server_service,
           enable     => false,
           hasstatus  => true,
           hasrestart => true,
@@ -436,16 +436,16 @@ class neutron::server (
           Service <| title == 'httpd' |> { tag +> 'neutron-service' }
           Neutron_api_paste_ini<||> ~> Service[$api_service_name]
 
-          if $::neutron::params::server_service {
+          if $neutron::params::server_service {
             Service['neutron-server'] -> Service[$api_service_name]
           }
 
-          if $::neutron::params::api_service_name {
+          if $neutron::params::api_service_name {
             # we need to make sure api service is stopped before trying to
             # start apache
             service { 'neutron-api':
               ensure     => 'stopped',
-              name       => $::neutron::params::api_service_name,
+              name       => $neutron::params::api_service_name,
               enable     => false,
               hasstatus  => true,
               hasrestart => true,
@@ -467,7 +467,7 @@ class neutron::server (
           Neutron_api_paste_ini<||> ~> Service['neutron-api']
           Neutron_api_uwsgi_config<||> ~> Service['neutron-api']
 
-          if $::neutron::params::server_service {
+          if $neutron::params::server_service {
             Service['neutron-server'] -> Service['neutron-api']
           }
         }
@@ -483,7 +483,7 @@ class neutron::server (
           tag        => ['neutron-service'],
         }
 
-        if $::neutron::params::server_service {
+        if $neutron::params::server_service {
           Service['neutron-server'] -> Service['neutron-rpc-server']
         }
       }
@@ -498,7 +498,7 @@ class neutron::server (
           tag        => ['neutron-service'],
         }
 
-        if $::neutron::params::server_service {
+        if $neutron::params::server_service {
           Service['neutron-server'] -> Service['neutron-periodic-workers']
         }
       }
diff --git a/manifests/services/bgpvpn.pp b/manifests/services/bgpvpn.pp
index 13f9283a6..3e1ca5317 100644
--- a/manifests/services/bgpvpn.pp
+++ b/manifests/services/bgpvpn.pp
@@ -49,7 +49,7 @@ class neutron::services::bgpvpn (
 
   package { 'python-networking-bgpvpn':
     ensure => $package_ensure,
-    name   => $::neutron::params::bgpvpn_plugin_package,
+    name   => $neutron::params::bgpvpn_plugin_package,
     tag    => ['openstack', 'neutron-package'],
   }
 
@@ -72,14 +72,14 @@ class neutron::services::bgpvpn (
     exec { 'bgpvpn-db-sync':
       command     => 'neutron-db-manage --subproject networking-bgpvpn upgrade head',
       path        => '/usr/bin',
-      user        => $::neutron::params::user,
+      user        => $neutron::params::user,
       subscribe   => [
         Anchor['neutron::install::end'],
         Anchor['neutron::config::end'],
         Anchor['neutron::dbsync::begin']
       ],
       notify      => Anchor['neutron::dbsync::end'],
-      refreshonly => true
+      refreshonly => true,
     }
   }
 }
diff --git a/manifests/services/dr.pp b/manifests/services/dr.pp
index 5bea88b87..1912d7e32 100644
--- a/manifests/services/dr.pp
+++ b/manifests/services/dr.pp
@@ -26,7 +26,7 @@ class neutron::services::dr (
 
   stdlib::ensure_packages('neutron-dynamic-routing', {
     ensure => $package_ensure,
-    name   => $::neutron::params::dynamic_routing_package,
+    name   => $neutron::params::dynamic_routing_package,
     tag    => ['openstack', 'neutron-package'],
   })
 
@@ -38,14 +38,14 @@ class neutron::services::dr (
     exec { 'dr-db-sync':
       command     => 'neutron-db-manage --subproject neutron-dynamic-routing upgrade head',
       path        => '/usr/bin',
-      user        => $::neutron::params::user,
+      user        => $neutron::params::user,
       subscribe   => [
         Anchor['neutron::install::end'],
         Anchor['neutron::config::end'],
         Anchor['neutron::dbsync::begin']
       ],
       notify      => Anchor['neutron::dbsync::end'],
-      refreshonly => true
+      refreshonly => true,
     }
   }
 }
diff --git a/manifests/services/fwaas.pp b/manifests/services/fwaas.pp
index e857ab8c5..57a621981 100644
--- a/manifests/services/fwaas.pp
+++ b/manifests/services/fwaas.pp
@@ -33,7 +33,7 @@ class neutron::services::fwaas (
 
   ensure_packages( 'neutron-fwaas', {
     'ensure' => $package_ensure,
-    'name'   => $::neutron::params::fwaas_package,
+    'name'   => $neutron::params::fwaas_package,
     'tag'    => ['openstack', 'neutron-package'],
   })
 
@@ -55,14 +55,14 @@ class neutron::services::fwaas (
     exec { 'fwaas-db-sync':
       command     => 'neutron-db-manage --subproject neutron-fwaas upgrade head',
       path        => '/usr/bin',
-      user        => $::neutron::params::user,
+      user        => $neutron::params::user,
       subscribe   => [
         Anchor['neutron::install::end'],
         Anchor['neutron::config::end'],
         Anchor['neutron::dbsync::begin']
       ],
       notify      => Anchor['neutron::dbsync::end'],
-      refreshonly => true
+      refreshonly => true,
     }
   }
 }
diff --git a/manifests/services/l2gw.pp b/manifests/services/l2gw.pp
index 833ff3bba..33a0bbfcb 100644
--- a/manifests/services/l2gw.pp
+++ b/manifests/services/l2gw.pp
@@ -58,7 +58,7 @@ class neutron::services::l2gw (
 
   package { 'python-networking-l2gw':
     ensure => $package_ensure,
-    name   => $::neutron::params::l2gw_package,
+    name   => $neutron::params::l2gw_package,
     tag    => ['openstack', 'neutron-package'],
   }
 
@@ -87,14 +87,14 @@ class neutron::services::l2gw (
     exec { 'l2gw-db-sync':
       command     => 'neutron-db-manage --subproject networking-l2gw upgrade head',
       path        => '/usr/bin',
-      user        => $::neutron::params::user,
+      user        => $neutron::params::user,
       subscribe   => [
         Anchor['neutron::install::end'],
         Anchor['neutron::config::end'],
         Anchor['neutron::dbsync::begin']
       ],
       notify      => Anchor['neutron::dbsync::end'],
-      refreshonly => true
+      refreshonly => true,
     }
   }
 }
diff --git a/manifests/services/sfc.pp b/manifests/services/sfc.pp
index 6d355a6a3..2045d0301 100644
--- a/manifests/services/sfc.pp
+++ b/manifests/services/sfc.pp
@@ -82,7 +82,7 @@ class neutron::services::sfc (
 
   package { 'python-networking-sfc':
     ensure => $package_ensure,
-    name   => $::neutron::params::sfc_package,
+    name   => $neutron::params::sfc_package,
     tag    => ['openstack', 'neutron-package'],
   }
 
@@ -99,14 +99,14 @@ class neutron::services::sfc (
     exec { 'sfc-db-sync':
       command     => 'neutron-db-manage --subproject networking-sfc upgrade head',
       path        => '/usr/bin',
-      user        => $::neutron::params::user,
+      user        => $neutron::params::user,
       subscribe   => [
         Anchor['neutron::install::end'],
         Anchor['neutron::config::end'],
         Anchor['neutron::dbsync::begin']
       ],
       notify      => Anchor['neutron::dbsync::end'],
-      refreshonly => true
+      refreshonly => true,
     }
   }
 }
diff --git a/manifests/services/taas.pp b/manifests/services/taas.pp
index beb0fe091..8ccbed826 100644
--- a/manifests/services/taas.pp
+++ b/manifests/services/taas.pp
@@ -53,7 +53,7 @@ class neutron::services::taas (
 
   stdlib::ensure_packages( 'neutron-taas', {
     'ensure' => $package_ensure,
-    'name'   => $::neutron::params::taas_package,
+    'name'   => $neutron::params::taas_package,
     'tag'    => ['openstack', 'neutron-package'],
   })
 
@@ -79,14 +79,14 @@ class neutron::services::taas (
     exec { 'taas-db-sync':
       command     => 'neutron-db-manage --subproject tap-as-a-service upgrade head',
       path        => '/usr/bin',
-      user        => $::neutron::params::user,
+      user        => $neutron::params::user,
       subscribe   => [
         Anchor['neutron::install::end'],
         Anchor['neutron::config::end'],
         Anchor['neutron::dbsync::begin']
       ],
       notify      => Anchor['neutron::dbsync::end'],
-      refreshonly => true
+      refreshonly => true,
     }
   }
 }
diff --git a/manifests/services/vpnaas.pp b/manifests/services/vpnaas.pp
index 58c16dbac..42802c7da 100644
--- a/manifests/services/vpnaas.pp
+++ b/manifests/services/vpnaas.pp
@@ -49,7 +49,7 @@ class neutron::services::vpnaas (
 
   stdlib::ensure_packages( 'neutron-vpnaas-agent', {
     'ensure' => $package_ensure,
-    'name'   => $::neutron::params::vpnaas_agent_package,
+    'name'   => $neutron::params::vpnaas_agent_package,
     'tag'    => ['openstack', 'neutron-package'],
   })
 
@@ -74,14 +74,14 @@ class neutron::services::vpnaas (
     exec { 'vpnaas-db-sync':
       command     => 'neutron-db-manage --subproject neutron-vpnaas upgrade head',
       path        => '/usr/bin',
-      user        => $::neutron::params::user,
+      user        => $neutron::params::user,
       subscribe   => [
         Anchor['neutron::install::end'],
         Anchor['neutron::config::end'],
         Anchor['neutron::dbsync::begin']
       ],
       notify      => Anchor['neutron::dbsync::end'],
-      refreshonly => true
+      refreshonly => true,
     }
   }
 }
diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp
index 0dad48eea..0ba3e2569 100644
--- a/manifests/wsgi/apache.pp
+++ b/manifests/wsgi/apache.pp
@@ -165,7 +165,7 @@ class neutron::wsgi::apache (
   openstacklib::wsgi::apache { 'neutron_wsgi':
     bind_host                   => $bind_host,
     bind_port                   => $port,
-    group                       => $::neutron::params::group,
+    group                       => $neutron::params::group,
     path                        => $path,
     priority                    => $priority,
     servername                  => $servername,
@@ -178,14 +178,14 @@ class neutron::wsgi::apache (
     ssl_crl_path                => $ssl_crl_path,
     ssl_key                     => $ssl_key,
     threads                     => $threads,
-    user                        => $::neutron::params::user,
+    user                        => $neutron::params::user,
     workers                     => $workers,
     wsgi_daemon_process         => 'neutron',
     wsgi_process_display_name   => $wsgi_process_display_name,
     wsgi_process_group          => 'neutron',
-    wsgi_script_dir             => $::neutron::params::neutron_wsgi_script_path,
+    wsgi_script_dir             => $neutron::params::neutron_wsgi_script_path,
     wsgi_script_file            => 'app',
-    wsgi_script_source          => $::neutron::params::neutron_wsgi_script_source,
+    wsgi_script_source          => $neutron::params::neutron_wsgi_script_source,
     headers                     => $headers,
     request_headers             => $request_headers,
     custom_wsgi_process_options => $custom_wsgi_process_options,