diff --git a/manifests/agents/dhcp.pp b/manifests/agents/dhcp.pp
index 0c1049205..c6c6432f7 100644
--- a/manifests/agents/dhcp.pp
+++ b/manifests/agents/dhcp.pp
@@ -43,7 +43,7 @@
 #
 # [*dnsmasq_config_file*]
 #   (optional) Override the default dnsmasq settings with this file.
-#   Defaults to undef
+#   Defaults to $::os_service_default
 #
 # [*dhcp_delete_namespaces*]
 #   (optional) Delete namespace after removing a dhcp server
@@ -70,7 +70,7 @@
 #   (optional) Deprecated. 'True' value will be enforced in future releases.
 #   Allow overlapping IP (Must have kernel build with
 #   CONFIG_NET_NS=y and iproute2 package that supports namespaces).
-#   Defaults to undef.
+#   Defaults to $::os_service_default.
 #
 class neutron::agents::dhcp (
   $package_ensure           = present,
@@ -83,13 +83,13 @@ class neutron::agents::dhcp (
   $dhcp_domain              = 'openstacklocal',
   $dhcp_driver              = 'neutron.agent.linux.dhcp.Dnsmasq',
   $root_helper              = 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf',
-  $dnsmasq_config_file      = undef,
+  $dnsmasq_config_file      = $::os_service_default,
   $dhcp_delete_namespaces   = true,
   $enable_isolated_metadata = false,
   $enable_metadata_network  = false,
   $dhcp_broadcast_reply     = false,
   # DEPRECATED PARAMETERS
-  $use_namespaces           = undef,
+  $use_namespaces           = $::os_service_default,
 ) {
 
   include ::neutron::params
@@ -132,25 +132,16 @@ class neutron::agents::dhcp (
     'DEFAULT/root_helper':            value => $root_helper;
     'DEFAULT/dhcp_delete_namespaces': value => $dhcp_delete_namespaces;
     'DEFAULT/dhcp_broadcast_reply':   value => $dhcp_broadcast_reply;
+    'DEFAULT/dnsmasq_config_file':    value => $dnsmasq_config_file;
   }
 
-  if $use_namespaces != undef {
+  if ! is_service_default ($use_namespaces) {
     warning('The use_namespaces parameter is deprecated and will be removed in future releases')
     neutron_dhcp_agent_config {
       'DEFAULT/use_namespaces':       value => $use_namespaces;
     }
   }
 
-  if $dnsmasq_config_file {
-    neutron_dhcp_agent_config {
-      'DEFAULT/dnsmasq_config_file':           value => $dnsmasq_config_file;
-    }
-  } else {
-    neutron_dhcp_agent_config {
-      'DEFAULT/dnsmasq_config_file':           ensure => absent;
-    }
-  }
-
   if $::neutron::params::dhcp_agent_package {
     Package['neutron']            -> Package['neutron-dhcp-agent']
     Package['neutron-dhcp-agent'] -> Neutron_config<||>
diff --git a/manifests/agents/l3.pp b/manifests/agents/l3.pp
index d8a2602a8..5ec228928 100644
--- a/manifests/agents/l3.pp
+++ b/manifests/agents/l3.pp
@@ -32,11 +32,11 @@
 #
 # [*router_id*]
 #   (optional) The ID of the external router in neutron
-#   Defaults to blank
+#   Defaults to $::os_service_default
 #
 # [*gateway_external_network_id*]
 #   (optional) The ID of the external network in neutron
-#   Defaults to blank
+#   Defaults to $::os_service_default
 #
 # [*handle_internal_only_routers*]
 #   (optional) L3 Agent will handle non-external routers
@@ -65,7 +65,7 @@
 #
 # [*network_device_mtu*]
 #   (optional) The MTU size for the interfaces managed by the L3 agent
-#   Defaults to undef
+#   Defaults to $::os_service_default
 #   Should be deprecated in the next major release in favor of a global parameter
 #
 # [*router_delete_namespaces*]
@@ -82,7 +82,7 @@
 #
 # [*ha_vrrp_auth_password*]
 #   (optional) VRRP authentication password. Required if ha_enabled = true.
-#   Defaults to undef
+#   Defaults to $::os_service_default
 #
 # [*ha_vrrp_advert_int*]
 #   (optional) The advertisement interval in seconds.
@@ -104,7 +104,7 @@
 #   (optional) Deprecated. 'True' value will be enforced in future releases.
 #   Allow overlapping IP (Must have kernel build with
 #   CONFIG_NET_NS=y and iproute2 package that supports namespaces).
-#   Defaults to undef.
+#   Defaults to $::os_service_default.
 #
 class neutron::agents::l3 (
   $package_ensure                   = 'present',
@@ -113,24 +113,24 @@ class neutron::agents::l3 (
   $debug                            = false,
   $external_network_bridge          = 'br-ex',
   $interface_driver                 = 'neutron.agent.linux.interface.OVSInterfaceDriver',
-  $router_id                        = undef,
-  $gateway_external_network_id      = undef,
+  $router_id                        = $::os_service_default,
+  $gateway_external_network_id      = $::os_service_default,
   $handle_internal_only_routers     = true,
   $metadata_port                    = '9697',
   $send_arp_for_ha                  = '3',
   $periodic_interval                = '40',
   $periodic_fuzzy_delay             = '5',
   $enable_metadata_proxy            = true,
-  $network_device_mtu               = undef,
+  $network_device_mtu               = $::os_service_default,
   $router_delete_namespaces         = true,
   $ha_enabled                       = false,
   $ha_vrrp_auth_type                = 'PASS',
-  $ha_vrrp_auth_password            = undef,
+  $ha_vrrp_auth_password            = $::os_service_default,
   $ha_vrrp_advert_int               = '3',
   $agent_mode                       = 'legacy',
   # DEPRECATED PARAMETERS
   $allow_automatic_l3agent_failover = false,
-  $use_namespaces                   = undef,
+  $use_namespaces                   = $::os_service_default,
 ) {
 
   include ::neutron::params
@@ -164,24 +164,16 @@ class neutron::agents::l3 (
     'DEFAULT/enable_metadata_proxy':            value => $enable_metadata_proxy;
     'DEFAULT/router_delete_namespaces':         value => $router_delete_namespaces;
     'DEFAULT/agent_mode':                       value => $agent_mode;
+    'DEFAULT/network_device_mtu':               value => $network_device_mtu;
+    'DEFAULT/use_namespaces':                   value => $use_namespaces;
   }
 
-  if $use_namespaces != undef {
+  if ! is_service_default ($use_namespaces) {
     warning('The use_namespaces parameter is deprecated and will be removed in future releases')
-    neutron_l3_agent_config {
-      'DEFAULT/use_namespaces':                 value => $use_namespaces;
-    }
   }
 
-  if $network_device_mtu {
+  if ! is_service_default ($network_device_mtu) {
     warning('The neutron::agents::l3::network_device_mtu parameter is deprecated, use neutron::network_device_mtu instead.')
-    neutron_l3_agent_config {
-      'DEFAULT/network_device_mtu':           value => $network_device_mtu;
-    }
-  } else {
-    neutron_l3_agent_config {
-      'DEFAULT/network_device_mtu':           ensure => absent;
-    }
   }
 
   if $::neutron::params::l3_agent_package {
diff --git a/manifests/agents/lbaas.pp b/manifests/agents/lbaas.pp
index 32d40c597..2771dcba3 100644
--- a/manifests/agents/lbaas.pp
+++ b/manifests/agents/lbaas.pp
@@ -38,7 +38,7 @@
 #   (optional) Deprecated. 'True' value will be enforced in future releases.
 #   Allow overlapping IP (Must have kernel build with
 #   CONFIG_NET_NS=y and iproute2 package that supports namespaces).
-#   Defaults to undef.
+#   Defaults to $::os_service_default.
 #
 class neutron::agents::lbaas (
   $package_ensure         = present,
@@ -50,7 +50,7 @@ class neutron::agents::lbaas (
   $user_group             = $::neutron::params::nobody_user_group,
   $manage_haproxy_package = true,
   # DEPRECATED PARAMETERS
-  $use_namespaces         = undef,
+  $use_namespaces         = $::os_service_default,
 ) {
 
   include ::neutron::params
@@ -80,7 +80,7 @@ class neutron::agents::lbaas (
     'haproxy/user_group':         value => $user_group;
   }
 
-  if $use_namespaces != undef {
+  if ! is_service_default ($use_namespaces) {
     warning('The use_namespaces parameter is deprecated and will be removed in future releases')
     neutron_lbaas_agent_config {
       'DEFAULT/use_namespaces':   value => $use_namespaces;
diff --git a/manifests/agents/metadata.pp b/manifests/agents/metadata.pp
index f4a7f13d3..ee1a177a4 100644
--- a/manifests/agents/metadata.pp
+++ b/manifests/agents/metadata.pp
@@ -37,10 +37,10 @@
 #   turn off verification of the certificate for ssl (Defaults to false)
 #
 # [*auth_ca_cert*]
-#   CA cert to check against with for ssl keystone. (Defaults to undef)
+#   CA cert to check against with for ssl keystone. (Defaults to $::os_service_default)
 #
 # [*auth_region*]
-#   The authentication region. (Defaults to undef)
+#   The authentication region. (Defaults to $::os_service_default)
 #
 # [*metadata_ip*]
 #   The IP address of the metadata service. Defaults to '127.0.0.1'.
@@ -67,7 +67,7 @@
 #   (optional) Specifies time in seconds a metadata cache entry is valid in
 #   memory caching backend.
 #   Set to 0 will cause cache entries to never expire.
-#   Set to undef or false to disable cache.
+#   Set to $::os_service_default or false to disable cache.
 #   Defaults to 5
 #
 
@@ -82,8 +82,8 @@ class neutron::agents::metadata (
   $auth_user                 = 'neutron',
   $auth_url                  = 'http://localhost:35357/v2.0',
   $auth_insecure             = false,
-  $auth_ca_cert              = undef,
-  $auth_region               = undef,
+  $auth_ca_cert              = $::os_service_default,
+  $auth_region               = $::os_service_default,
   $metadata_ip               = '127.0.0.1',
   $metadata_port             = '8775',
   $metadata_protocol         = 'http',
@@ -99,8 +99,10 @@ class neutron::agents::metadata (
 
   neutron_metadata_agent_config {
     'DEFAULT/debug':                          value => $debug;
+    'DEFAULT/auth_ca_cert':                   value => $auth_ca_cert;
     'DEFAULT/auth_url':                       value => $auth_url;
     'DEFAULT/auth_insecure':                  value => $auth_insecure;
+    'DEFAULT/auth_region':                    value => $auth_region;
     'DEFAULT/admin_tenant_name':              value => $auth_tenant;
     'DEFAULT/admin_user':                     value => $auth_user;
     'DEFAULT/admin_password':                 value => $auth_password, secret => true;
@@ -112,17 +114,7 @@ class neutron::agents::metadata (
     'DEFAULT/metadata_backlog':               value => $metadata_backlog;
   }
 
-  if $auth_region {
-    neutron_metadata_agent_config {
-      'DEFAULT/auth_region': value => $auth_region;
-    }
-  } else {
-    neutron_metadata_agent_config {
-      'DEFAULT/auth_region': ensure => absent;
-    }
-  }
-
-  if $metadata_memory_cache_ttl {
+  if ! is_service_default ($metadata_memory_cache_ttl) {
     neutron_metadata_agent_config {
       'DEFAULT/cache_url': value => "memory://?default_ttl=${metadata_memory_cache_ttl}";
     }
@@ -132,16 +124,6 @@ class neutron::agents::metadata (
     }
   }
 
-  if $auth_ca_cert {
-    neutron_metadata_agent_config {
-      'DEFAULT/auth_ca_cert': value => $auth_ca_cert;
-    }
-  } else {
-    neutron_metadata_agent_config {
-      'DEFAULT/auth_ca_cert': ensure => absent;
-    }
-  }
-
   if $::neutron::params::metadata_agent_package {
     Package['neutron-metadata'] -> Service['neutron-metadata']
     package { 'neutron-metadata':
diff --git a/manifests/agents/metering.pp b/manifests/agents/metering.pp
index ef94a01ca..163416429 100644
--- a/manifests/agents/metering.pp
+++ b/manifests/agents/metering.pp
@@ -54,7 +54,7 @@
 #   (optional) Deprecated. 'True' value will be enforced in future releases.
 #   Allow overlapping IP (Must have kernel build with
 #   CONFIG_NET_NS=y and iproute2 package that supports namespaces).
-#   Defaults to undef.
+#   Defaults to $::os_service_default.
 #
 
 class neutron::agents::metering (
@@ -67,7 +67,7 @@ class neutron::agents::metering (
   $measure_interval = '30',
   $report_interval  = '300',
   # DEPRECATED PARAMETERS
-  $use_namespaces   = undef,
+  $use_namespaces   = $::os_service_default,
 ) {
 
   include ::neutron::params
@@ -86,7 +86,7 @@ class neutron::agents::metering (
     'DEFAULT/report_interval':    value => $report_interval;
   }
 
-  if $use_namespaces != undef {
+  if ! is_service_default ($use_namespaces) {
     warning('The use_namespaces parameter is deprecated and will be removed in future releases')
     neutron_metering_agent_config {
       'DEFAULT/use_namespaces':   value => $use_namespaces;
diff --git a/manifests/agents/vpnaas.pp b/manifests/agents/vpnaas.pp
index 69636b505..4f1b6ad01 100644
--- a/manifests/agents/vpnaas.pp
+++ b/manifests/agents/vpnaas.pp
@@ -38,7 +38,7 @@
 #  (optional) Defaults to 'neutron.agent.linux.interface.OVSInterfaceDriver'.
 #
 # [*external_network_bridge*]
-#  (optional) Defaults to undef
+#  (optional) Defaults to $::os_service_default
 #
 # [*ipsec_status_check_interval*]
 #   (optional) Status check interval. Defaults to '60'.
@@ -49,7 +49,7 @@ class neutron::agents::vpnaas (
   $manage_service              = true,
   $vpn_device_driver           = 'neutron.services.vpn.device_drivers.ipsec.OpenSwanDriver',
   $interface_driver            = 'neutron.agent.linux.interface.OVSInterfaceDriver',
-  $external_network_bridge     = undef,
+  $external_network_bridge     = $::os_service_default,
   $ipsec_status_check_interval = '60'
 ) {
 
@@ -80,14 +80,8 @@ class neutron::agents::vpnaas (
     'DEFAULT/interface_driver':          value => $interface_driver;
   }
 
-  if ($external_network_bridge) {
-    neutron_vpnaas_agent_config {
-      'DEFAULT/external_network_bridge': value => $external_network_bridge;
-    }
-  } else {
-    neutron_vpnaas_agent_config {
-      'DEFAULT/external_network_bridge': ensure => absent;
-    }
+  neutron_vpnaas_agent_config {
+    'DEFAULT/external_network_bridge': value => $external_network_bridge;
   }
 
   if $::neutron::params::vpnaas_agent_package {
diff --git a/manifests/init.pp b/manifests/init.pp
index 5a6e7c151..7ae1948bf 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -44,7 +44,7 @@
 #   (optional) Advanced service modules.
 #   Could be an array that can have these elements:
 #   router, firewall, lbaas, vpnaas, metering
-#   Defaults to empty
+#   Defaults to $::os_service_default
 #
 # [*auth_strategy*]
 #   (optional) How to authenticate
@@ -69,7 +69,7 @@
 #
 # [*network_device_mtu*]
 #   (optional) The MTU size for the interfaces managed by neutron
-#   Defaults to undef
+#   Defaults to $::os_service_default
 #
 # [*dhcp_agent_notification*]
 #   (optional) Allow sending resource operation notification to DHCP agent.
@@ -98,7 +98,7 @@
 # [*api_extensions_path*]
 #   (optional) Specify additional paths for API extensions that the
 #   module in use needs to load.
-#   Defaults to undef
+#   Defaults to $::os_service_default
 #
 # [*root_helper*]
 #  (optional) Use "sudo neutron-rootwrap /etc/neutron/rootwrap.conf" to use the real
@@ -166,15 +166,15 @@
 #
 # [*kombu_ssl_ca_certs*]
 #   (optional) SSL certification authority file (valid only if SSL enabled).
-#   Defaults to undef
+#   Defaults to $::os_service_default
 #
 # [*kombu_ssl_certfile*]
 #   (optional) SSL cert file (valid only if SSL enabled).
-#   Defaults to undef
+#   Defaults to $::os_service_default
 #
 # [*kombu_ssl_keyfile*]
 #   (optional) SSL key file (valid only if SSL enabled).
-#   Defaults to undef
+#   Defaults to $::os_service_default
 #
 # [*kombu_ssl_version*]
 #   (optional) SSL version to use (valid only if SSL enabled).
@@ -259,20 +259,20 @@ class neutron (
   $bind_host                          = '0.0.0.0',
   $bind_port                          = '9696',
   $core_plugin                        = 'openvswitch',
-  $service_plugins                    = undef,
+  $service_plugins                    = $::os_service_default,
   $auth_strategy                      = 'keystone',
   $base_mac                           = 'fa:16:3e:00:00:00',
   $mac_generation_retries             = 16,
   $dhcp_lease_duration                = 86400,
   $dhcp_agents_per_network            = 1,
-  $network_device_mtu                 = undef,
+  $network_device_mtu                 = $::os_service_default,
   $dhcp_agent_notification            = true,
   $advertise_mtu                      = false,
   $allow_bulk                         = true,
   $allow_pagination                   = false,
   $allow_sorting                      = false,
   $allow_overlapping_ips              = false,
-  $api_extensions_path                = undef,
+  $api_extensions_path                = $::os_service_default,
   $root_helper                        = 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf',
   $report_interval                    = '30',
   $memcache_servers                   = false,
@@ -288,9 +288,9 @@ class neutron (
   $rabbit_heartbeat_timeout_threshold = 0,
   $rabbit_heartbeat_rate              = 2,
   $rabbit_use_ssl                     = false,
-  $kombu_ssl_ca_certs                 = undef,
-  $kombu_ssl_certfile                 = undef,
-  $kombu_ssl_keyfile                  = undef,
+  $kombu_ssl_ca_certs                 = $::os_service_default,
+  $kombu_ssl_certfile                 = $::os_service_default,
+  $kombu_ssl_keyfile                  = $::os_service_default,
   $kombu_ssl_version                  = 'TLSv1',
   $kombu_reconnect_delay              = '1.0',
   $qpid_hostname                      = 'localhost',
@@ -334,16 +334,16 @@ class neutron (
     fail('The ca_file parameter requires that use_ssl to be set to true')
   }
 
-  if $kombu_ssl_ca_certs and !$rabbit_use_ssl {
+  if ! is_service_default($kombu_ssl_ca_certs) and !$rabbit_use_ssl {
     fail('The kombu_ssl_ca_certs parameter requires rabbit_use_ssl to be set to true')
   }
-  if $kombu_ssl_certfile and !$rabbit_use_ssl {
+  if ! is_service_default($kombu_ssl_certfile) and !$rabbit_use_ssl {
     fail('The kombu_ssl_certfile parameter requires rabbit_use_ssl to be set to true')
   }
-  if $kombu_ssl_keyfile and !$rabbit_use_ssl {
+  if ! is_service_default($kombu_ssl_keyfile) and !$rabbit_use_ssl {
     fail('The kombu_ssl_keyfile parameter requires rabbit_use_ssl to be set to true')
   }
-  if ($kombu_ssl_certfile and !$kombu_ssl_keyfile) or ($kombu_ssl_keyfile and !$kombu_ssl_certfile) {
+  if (is_service_default($kombu_ssl_certfile) and ! is_service_default($kombu_ssl_keyfile)) or (is_service_default($kombu_ssl_keyfile) and ! is_service_default($kombu_ssl_certfile)) {
     fail('The kombu_ssl_certfile and kombu_ssl_keyfile parameters must be used together')
   }
 
@@ -384,6 +384,7 @@ class neutron (
     'DEFAULT/state_path':              value => $state_path;
     'DEFAULT/lock_path':               value => $lock_path;
     'DEFAULT/rpc_response_timeout':    value => $rpc_response_timeout;
+    'DEFAULT/network_device_mtu':      value => $network_device_mtu;
     'agent/root_helper':               value => $root_helper;
     'agent/report_interval':           value => $report_interval;
   }
@@ -407,18 +408,7 @@ class neutron (
     }
   }
 
-  if $network_device_mtu {
-    neutron_config {
-      'DEFAULT/network_device_mtu':           value => $network_device_mtu;
-    }
-  } else {
-    neutron_config {
-      'DEFAULT/network_device_mtu':           ensure => absent;
-    }
-  }
-
-
-  if $service_plugins {
+  if ! is_service_default ($service_plugins) {
     if is_array($service_plugins) {
       neutron_config { 'DEFAULT/service_plugins': value => join($service_plugins, ',') }
     } else {
@@ -459,28 +449,13 @@ class neutron (
       'oslo_messaging_rabbit/heartbeat_rate':               value => $rabbit_heartbeat_rate;
       'oslo_messaging_rabbit/rabbit_use_ssl':               value => $rabbit_use_ssl;
       'oslo_messaging_rabbit/kombu_reconnect_delay':        value => $kombu_reconnect_delay;
+      'oslo_messaging_rabbit/kombu_ssl_ca_certs':           value => $kombu_ssl_ca_certs;
+      'oslo_messaging_rabbit/kombu_ssl_certfile':           value => $kombu_ssl_certfile;
+      'oslo_messaging_rabbit/kombu_ssl_keyfile':            value => $kombu_ssl_keyfile;
     }
 
     if $rabbit_use_ssl {
 
-      if $kombu_ssl_ca_certs {
-        neutron_config { 'oslo_messaging_rabbit/kombu_ssl_ca_certs': value => $kombu_ssl_ca_certs; }
-      } else {
-        neutron_config { 'oslo_messaging_rabbit/kombu_ssl_ca_certs': ensure => absent; }
-      }
-
-      if $kombu_ssl_certfile or $kombu_ssl_keyfile {
-        neutron_config {
-          'oslo_messaging_rabbit/kombu_ssl_certfile': value => $kombu_ssl_certfile;
-          'oslo_messaging_rabbit/kombu_ssl_keyfile':  value => $kombu_ssl_keyfile;
-        }
-      } else {
-        neutron_config {
-          'oslo_messaging_rabbit/kombu_ssl_certfile': ensure => absent;
-          'oslo_messaging_rabbit/kombu_ssl_keyfile':  ensure => absent;
-        }
-      }
-
       if $kombu_ssl_version {
         neutron_config { 'oslo_messaging_rabbit/kombu_ssl_version':  value => $kombu_ssl_version; }
       } else {
@@ -489,9 +464,6 @@ class neutron (
 
     } else {
       neutron_config {
-        'oslo_messaging_rabbit/kombu_ssl_ca_certs': ensure => absent;
-        'oslo_messaging_rabbit/kombu_ssl_certfile': ensure => absent;
-        'oslo_messaging_rabbit/kombu_ssl_keyfile':  ensure => absent;
         'oslo_messaging_rabbit/kombu_ssl_version':  ensure => absent;
       }
     }
diff --git a/manifests/plugins/cisco.pp b/manifests/plugins/cisco.pp
index c8d9394e3..07c6a8847 100644
--- a/manifests/plugins/cisco.pp
+++ b/manifests/plugins/cisco.pp
@@ -42,7 +42,7 @@
 #
 # [*nexus_plugin*]
 # (optional) The nexus plugin to use
-# Defaults to undef. This will not set a nexus plugin to use
+# Defaults to $::os_service_default. This will not set a nexus plugin to use
 # Can be set to neutron.plugins.cisco.nexus.cisco_nexus_plugin_v2.NexusPlugin
 #
 # [*vlan_start*]
@@ -101,7 +101,7 @@ class neutron::plugins::cisco(
   $keystone_auth_url = 'http://127.0.0.1:35357/v2.0/',
 
   $vswitch_plugin = 'neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2',
-  $nexus_plugin   = undef,
+  $nexus_plugin   = $::os_service_default,
 
   # Plugin minimum configuration
   $vlan_start        = '100',
@@ -162,10 +162,8 @@ class neutron::plugins::cisco(
   }
 
 
-  if $nexus_plugin {
-    neutron_plugin_cisco {
-      'PLUGINS/nexus_plugin' : value => $nexus_plugin;
-    }
+  neutron_plugin_cisco {
+    'PLUGINS/nexus_plugin' : value => $nexus_plugin;
   }
 
   if $vswitch_plugin {
diff --git a/manifests/plugins/midonet.pp b/manifests/plugins/midonet.pp
index cee2ccddb..fce255820 100644
--- a/manifests/plugins/midonet.pp
+++ b/manifests/plugins/midonet.pp
@@ -17,6 +17,7 @@
 #   service is desirable and defaulted)
 # [*keystone_password*]
 #   Password from which midonet api will authenticate against Keystone
+#   Defaults to $::os_service_default
 # [*keystone_tenant*]
 #   Tenant from which midonet api will authenticate against Keystone (services
 #   tenant is desirable and defaulted)
@@ -69,7 +70,7 @@ class neutron::plugins::midonet (
   $midonet_api_ip    = '127.0.0.1',
   $midonet_api_port  = '8080',
   $keystone_username = 'neutron',
-  $keystone_password = undef,
+  $keystone_password = $::os_service_default,
   $keystone_tenant   = 'services',
   $sync_db           = false
 ) {
diff --git a/manifests/plugins/ml2.pp b/manifests/plugins/ml2.pp
index 2ddff7799..7a8de4fd7 100644
--- a/manifests/plugins/ml2.pp
+++ b/manifests/plugins/ml2.pp
@@ -107,7 +107,7 @@
 # [*physical_network_mtus*]
 #   (optional) For L2 mechanism drivers, per-physical network MTU setting.
 #   Should be an array with 'physnetX1:9000'.
-#   Defaults to undef.
+#   Defaults to $::os_service_default.
 #
 # [*path_mtu*]
 #   (optional) For L3 mechanism drivers, determines the maximum permissible
@@ -129,7 +129,7 @@ class neutron::plugins::ml2 (
   $package_ensure            = 'present',
   $supported_pci_vendor_devs = ['15b3:1004', '8086:10ca'],
   $sriov_agent_required      = false,
-  $physical_network_mtus     = undef,
+  $physical_network_mtus     = $::os_service_default,
   $path_mtu                  = 0,
 ) {
 
@@ -201,7 +201,7 @@ class neutron::plugins::ml2 (
     'securitygroup/enable_security_group':  value => $enable_security_group;
   }
 
-  if empty($physical_network_mtus) {
+  if is_service_default($physical_network_mtus) {
     neutron_plugin_ml2 {
       'ml2/physical_network_mtus': ensure => absent;
     }
diff --git a/manifests/plugins/ml2/cisco/nexus1000v.pp b/manifests/plugins/ml2/cisco/nexus1000v.pp
index aeac6c59f..07d5f0f28 100644
--- a/manifests/plugins/ml2/cisco/nexus1000v.pp
+++ b/manifests/plugins/ml2/cisco/nexus1000v.pp
@@ -72,9 +72,9 @@
 # enable_vif_type_n1kv = False
 #
 class neutron::plugins::ml2::cisco::nexus1000v (
-  $n1kv_vsm_ip                          = undef,
-  $n1kv_vsm_username                    = undef,
-  $n1kv_vsm_password                    = undef,
+  $n1kv_vsm_ip                          = $::os_service_default,
+  $n1kv_vsm_username                    = $::os_service_default,
+  $n1kv_vsm_password                    = $::os_service_default,
   $default_policy_profile               = 'default-pp',
   $default_vlan_network_profile         = 'default-vlan-np',
   $default_vxlan_network_profile        = 'default-vxlan-np',
diff --git a/manifests/plugins/ml2/cisco/nexus_switch.pp b/manifests/plugins/ml2/cisco/nexus_switch.pp
index e18fe5a3c..450dc3d6a 100644
--- a/manifests/plugins/ml2/cisco/nexus_switch.pp
+++ b/manifests/plugins/ml2/cisco/nexus_switch.pp
@@ -65,7 +65,7 @@
 # in the transport network. (NB: If no nve_src_intf is defined then a
 # default setting of 0 (creates "loopback0") will be used.)
 #
-# Defaults to undef.
+# Defaults to $::os_service_default.
 #
 # [*physnet*]
 # (optional) Only valid if VXLAN overlay is configured.
@@ -76,7 +76,7 @@
 # a physical network are allocated dynamically and are unique per physical
 # network. These dynamic vlans may be reused across physical networks.
 #
-# Defaults to undef.
+# Defaults to $::os_service_default.
 #
 define neutron::plugins::ml2::cisco::nexus_switch(
   $username,
@@ -85,8 +85,8 @@ define neutron::plugins::ml2::cisco::nexus_switch(
   $ssh_port,
   $servers,
   $switchname   = $title,
-  $nve_src_intf = undef,
-  $physnet      = undef
+  $nve_src_intf = $::os_service_default,
+  $physnet      = $::os_service_default
 ) {
   $section = "ML2_MECH_CISCO_NEXUS:${ip_address}"
   neutron_plugin_ml2 {
diff --git a/manifests/plugins/ml2/cisco/ucsm.pp b/manifests/plugins/ml2/cisco/ucsm.pp
index 0a3ed131b..4b2254f7e 100644
--- a/manifests/plugins/ml2/cisco/ucsm.pp
+++ b/manifests/plugins/ml2/cisco/ucsm.pp
@@ -23,7 +23,7 @@
 # [*supported_pci_devs*]
 #   (optional) SR-IOV and VM-FEX vendors supported by this plugin
 #   xxxx:yyyy represents vendor_id:product_id
-#   Defaults to undef
+#   Defaults to $::os_service_default
 #   Example:
 #   [ '2222:3333', '4444:5555' ]
 #
@@ -33,7 +33,7 @@ class neutron::plugins::ml2::cisco::ucsm (
   $ucsm_username,
   $ucsm_password,
   $ucsm_host_list,
-  $supported_pci_devs = undef,
+  $supported_pci_devs = $::os_service_default,
 ) {
   include ::neutron::plugins::ml2::cisco
 
diff --git a/manifests/plugins/nvp.pp b/manifests/plugins/nvp.pp
index 4186427bc..6db315526 100644
--- a/manifests/plugins/nvp.pp
+++ b/manifests/plugins/nvp.pp
@@ -19,7 +19,7 @@
 # [*default_l3_gw_service_uuid*]
 #   (Optional) UUID for the default l3 gateway service to use with this cluster.
 #   To be specified if planning to use logical routers with external gateways.
-#   Defaults to None.
+#   Defaults to $::os_service_default.
 #
 # [*package_ensure*]
 #   (optional) Ensure state for package.
@@ -30,7 +30,7 @@ class neutron::plugins::nvp (
   $nvp_controllers,
   $nvp_user,
   $nvp_password,
-  $default_l3_gw_service_uuid = undef,
+  $default_l3_gw_service_uuid = $::os_service_default,
   $package_ensure    = 'present'
 ) {
 
@@ -49,17 +49,12 @@ class neutron::plugins::nvp (
   validate_array($nvp_controllers)
 
   neutron_plugin_nvp {
-    'DEFAULT/default_tz_uuid': value => $default_tz_uuid;
-    'DEFAULT/nvp_controllers': value => join($nvp_controllers, ',');
-    'DEFAULT/nvp_user':        value => $nvp_user;
-    'DEFAULT/nvp_password':    value => $nvp_password, secret => true;
-    'nvp/metadata_mode':       value => 'access_network';
-  }
-
-  if($default_l3_gw_service_uuid) {
-    neutron_plugin_nvp {
-      'DEFAULT/default_l3_gw_service_uuid': value => $default_l3_gw_service_uuid;
-    }
+    'DEFAULT/default_tz_uuid':            value => $default_tz_uuid;
+    'DEFAULT/nvp_controllers':            value => join($nvp_controllers, ',');
+    'DEFAULT/nvp_user':                   value => $nvp_user;
+    'DEFAULT/nvp_password':               value => $nvp_password, secret => true;
+    'DEFAULT/default_l3_gw_service_uuid': value => $default_l3_gw_service_uuid;
+    'nvp/metadata_mode':                  value => 'access_network';
   }
 
   if $::neutron::core_plugin != 'neutron.plugins.nicira.NeutronPlugin.NvpPluginV2' {
diff --git a/manifests/plugins/opencontrail.pp b/manifests/plugins/opencontrail.pp
index e71ca9e14..47d949032 100644
--- a/manifests/plugins/opencontrail.pp
+++ b/manifests/plugins/opencontrail.pp
@@ -4,19 +4,19 @@
 #
 # [*api_server_ip*]
 #   IP address of the API Server
-#   Defaults to undef
+#   Defaults to $::os_service_default
 #
 # [*api_server_port*]
 #   Port of the API Server.
-#   Defaults to undef
+#   Defaults to $::os_service_default
 #
 # [*multi_tenancy*]
 #   Whether to enable multi-tenancy
-#   Default to undef
+#   Default to $::os_service_default
 #
 # [*contrail_extensions*]
 #   Array of OpenContrail extensions to be supported
-#   Defaults to undef
+#   Defaults to $::os_service_default
 #   Example:
 #
 #     class {'neutron::plugins::opencontrail' :
@@ -25,38 +25,38 @@
 #
 # [*keystone_auth_url*]
 #   Url of the keystone auth server
-#   Defaults to undef
+#   Defaults to $::os_service_default
 #
 # [*keystone_admin_user*]
 #   Admin user name
-#   Defaults to undef
+#   Defaults to $::os_service_default
 #
 # [*keystone_admin_tenant_name*]
 #   Admin_tenant_name
-#   Defaults to undef
+#   Defaults to $::os_service_default
 #
 # [*keystone_admin_password*]
 #   Admin password
-#   Defaults to undef
+#   Defaults to $::os_service_default
 #
 # [*keystone_admin_token*]
 #   Admin token
-#   Defaults to undef
+#   Defaults to $::os_service_default
 #
 # [*package_ensure*]
 #   (optional) Ensure state for package.
 #   Defaults to 'present'.
 #
 class neutron::plugins::opencontrail (
-  $api_server_ip              = undef,
-  $api_server_port            = undef,
-  $multi_tenancy              = undef,
-  $contrail_extensions        = undef,
-  $keystone_auth_url          = undef,
-  $keystone_admin_user        = undef,
-  $keystone_admin_tenant_name = undef,
-  $keystone_admin_password    = undef,
-  $keystone_admin_token       = undef,
+  $api_server_ip              = $::os_service_default,
+  $api_server_port            = $::os_service_default,
+  $multi_tenancy              = $::os_service_default,
+  $contrail_extensions        = $::os_service_default,
+  $keystone_auth_url          = $::os_service_default,
+  $keystone_admin_user        = $::os_service_default,
+  $keystone_admin_tenant_name = $::os_service_default,
+  $keystone_admin_password    = $::os_service_default,
+  $keystone_admin_token       = $::os_service_default,
   $package_ensure             = 'present',
 ) {
 
diff --git a/manifests/plugins/plumgrid.pp b/manifests/plugins/plumgrid.pp
index 07376ce8c..043a07221 100644
--- a/manifests/plugins/plumgrid.pp
+++ b/manifests/plugins/plumgrid.pp
@@ -12,9 +12,11 @@
 #
 # [*username*]
 #   PLUMgrid platform username
+#   Defaults to $::os_service_default
 #
 # [*password*]
 #   PLUMgrid platform password
+#   Defaults to $::os_service_default
 #
 # [*servertimeout*]
 #   Request timeout duration (seconds) to PLUMgrid paltform
@@ -26,6 +28,7 @@
 #
 # [*admin_password*]
 #   Keystone admin password
+#   Defaults to $::os_service_default
 #
 # [*controller_priv_host*]
 #   Controller private host IP
@@ -45,6 +48,7 @@
 #
 # [*metadata_proxy_shared_secret*]
 #   Neutron metadata shared secret key
+#   Defaults to $::os_service_default
 #
 # [*package_ensure*]
 #   (optional) Ensure state for package.
@@ -53,16 +57,16 @@
 class neutron::plugins::plumgrid (
   $director_server              = '127.0.0.1',
   $director_server_port         = '443',
-  $username                     = undef,
-  $password                     = undef,
+  $username                     = $::os_service_default,
+  $password                     = $::os_service_default,
   $servertimeout                = '99',
   $connection                   = 'http://127.0.0.1:35357/v2.0',
-  $admin_password               = undef,
+  $admin_password               = $::os_service_default,
   $controller_priv_host         = '127.0.0.1',
   $auth_protocol                = 'http',
   $nova_metadata_ip             = '127.0.0.1',
   $nova_metadata_port           = '8775',
-  $metadata_proxy_shared_secret = undef,
+  $metadata_proxy_shared_secret = $::os_service_default,
   $package_ensure               = 'present'
 ) {
 
diff --git a/manifests/server.pp b/manifests/server.pp
index ad13f8e4d..c4becae41 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -55,7 +55,7 @@
 # [*auth_region*]
 #   (optional) The authentication region. Note this value is case-sensitive and
 #   must match the endpoint region defined in Keystone.
-#   Defaults to undef
+#   Defaults to $::os_service_default
 #
 # [*auth_tenant*]
 #   (optional) The tenant of the auth user
@@ -202,7 +202,7 @@ class neutron::server (
   $manage_service                   = true,
   $service_name                     = $::neutron::params::server_service,
   $auth_password                    = false,
-  $auth_region                      = undef,
+  $auth_region                      = $::os_service_default,
   $auth_type                        = 'keystone',
   $auth_tenant                      = 'services',
   $auth_user                        = 'neutron',
@@ -435,10 +435,8 @@ class neutron::server (
         'filter:authtoken/auth_uri': value => $auth_uri_real;
       }
 
-      if $auth_region {
-        neutron_config {
-          'keystone_authtoken/auth_region': value => $auth_region;
-        }
+      neutron_config {
+        'keystone_authtoken/auth_region': value => $auth_region;
       }
 
       if $identity_uri {
diff --git a/manifests/server/notifications.pp b/manifests/server/notifications.pp
index cb90a4dbe..4f5b4673b 100644
--- a/manifests/server/notifications.pp
+++ b/manifests/server/notifications.pp
@@ -76,7 +76,7 @@
 # [*region_name*]
 #   (optional) Name of nova region to use. Useful if keystone manages more than
 #   one region.
-#   Defaults to undef
+#   Defaults to $::os_service_default
 #
 # === Deprecated Parameters
 #
@@ -109,7 +109,7 @@
 #   Deprecated. region_name parameter should be used instead
 #   Name of nova region to use. Useful if keystone manages more than
 #   one region.
-#   Defaults to undef
+#   Defaults to $::os_service_default
 #
 
 class neutron::server::notifications (
@@ -120,20 +120,20 @@ class neutron::server::notifications (
   $auth_plugin                        = 'password',
   $username                           = 'nova',
   $password                           = false,
-  $tenant_id                          = undef,
+  $tenant_id                          = $::os_service_default,
   $tenant_name                        = 'services',
   $project_domain_id                  = 'default',
   $project_name                       = 'services',
   $user_domain_id                     = 'default',
   $auth_url                           = 'http://127.0.0.1:35357',
-  $region_name                        = undef,
+  $region_name                        = $::os_service_default,
   # DEPRECATED PARAMETERS
   $nova_admin_auth_url                = 'http://127.0.0.1:35357/v2.0',
   $nova_admin_username                = 'nova',
   $nova_admin_tenant_name             = 'services',
-  $nova_admin_tenant_id               = undef,
+  $nova_admin_tenant_id               = $::os_service_default,
   $nova_admin_password                = false,
-  $nova_region_name                   = undef,
+  $nova_region_name                   = $::os_service_default,
 ) {
 
   # Depend on the specified keystone_user resource, if it exists.
@@ -143,23 +143,24 @@ class neutron::server::notifications (
     fail('nova_admin_password or password must be set.')
   }
 
-  if $nova_admin_password and !($nova_admin_tenant_id or $nova_admin_tenant_name) {
+  if $nova_admin_password and is_service_default($nova_admin_tenant_id) and (! $nova_admin_tenant_name) {
     fail('You must provide either nova_admin_tenant_name or nova_admin_tenant_id.')
   }
 
-  if $password and !($tenant_id or $tenant_name) {
+  if $password and is_service_default($tenant_id) and (! $tenant_name) {
     fail('You must provide either tenant_name or tenant_id.')
   }
 
   if $nova_admin_password {
-    warning('nova_admin-* parameters are deprecated and will be removed in a future release')
+    warning('nova_admin-* and nova_region_name parameters are deprecated and will be removed in a future release')
     neutron_config {
       'DEFAULT/nova_admin_auth_url': value => $nova_admin_auth_url;
       'DEFAULT/nova_admin_username': value => $nova_admin_username;
       'DEFAULT/nova_admin_password': value => $nova_admin_password, secret => true;
+      'DEFAULT/nova_region_name':    value => $nova_region_name;
     }
 
-    if $nova_admin_tenant_id {
+    if ! is_service_default ($nova_admin_tenant_id) {
       neutron_config {
         'DEFAULT/nova_admin_tenant_id': value => $nova_admin_tenant_id;
       }
@@ -179,12 +180,16 @@ class neutron::server::notifications (
       'nova/project_domain_id': value => $project_domain_id;
       'nova/project_name':      value => $project_name;
       'nova/user_domain_id':    value => $user_domain_id;
-      'nova/tenant_name':       value => $tenant_name;
+      'nova/region_name':       value => $region_name;
     }
-    if $tenant_id {
+    if ! is_service_default ($tenant_id) {
       neutron_config {
         'nova/tenant_id': value => $tenant_id;
       }
+    } else {
+      neutron_config {
+        'nova/tenant_name': value => $tenant_name;
+      }
     }
   }
 
@@ -194,26 +199,4 @@ class neutron::server::notifications (
     'DEFAULT/send_events_interval':               value => $send_events_interval;
     'DEFAULT/nova_url':                           value => $nova_url;
   }
-
-  if $nova_region_name {
-    warning('nova_region_name parameter is deprecated and will be removed in a future release')
-    neutron_config {
-      'DEFAULT/nova_region_name': value => $nova_region_name;
-    }
-  } else {
-    neutron_config {
-      'DEFAULT/nova_region_name': ensure => absent;
-    }
-  }
-
-  if $region_name {
-    neutron_config {
-      'nova/region_name': value => $region_name;
-    }
-  } else {
-    neutron_config {
-      'nova/region_name': ensure => absent;
-    }
-  }
-
 }
diff --git a/spec/classes/neutron_agents_dhcp_spec.rb b/spec/classes/neutron_agents_dhcp_spec.rb
index a06f47295..e6cd62f38 100644
--- a/spec/classes/neutron_agents_dhcp_spec.rb
+++ b/spec/classes/neutron_agents_dhcp_spec.rb
@@ -28,7 +28,7 @@ describe 'neutron::agents::dhcp' do
       :dhcp_broadcast_reply   => false }
   end
 
-  let :default_facts do
+  let :test_facts do
     { :operatingsystem           => 'default',
       :operatingsystemrelease    => 'default'
     }
@@ -161,7 +161,9 @@ describe 'neutron::agents::dhcp' do
 
   context 'on Debian platforms' do
     let :facts do
-      default_facts.merge({ :osfamily => 'Debian' })
+      @default_facts.merge(test_facts.merge({
+         :osfamily => 'Debian'
+      }))
     end
 
     let :platform_params do
@@ -180,10 +182,10 @@ describe 'neutron::agents::dhcp' do
 
   context 'on RedHat platforms' do
     let :facts do
-      default_facts.merge({
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '7'
-      })
+      @default_facts.merge(test_facts.merge({
+         :osfamily               => 'RedHat',
+         :operatingsystemrelease => '7'
+      }))
     end
 
     let :platform_params do
diff --git a/spec/classes/neutron_agents_l3_spec.rb b/spec/classes/neutron_agents_l3_spec.rb
index 1a69ff4c4..6a62ab0a8 100644
--- a/spec/classes/neutron_agents_l3_spec.rb
+++ b/spec/classes/neutron_agents_l3_spec.rb
@@ -11,26 +11,21 @@ describe 'neutron::agents::l3' do
       :enabled                          => true,
       :debug                            => false,
       :external_network_bridge          => 'br-ex',
-      :use_namespaces                   => nil,
       :interface_driver                 => 'neutron.agent.linux.interface.OVSInterfaceDriver',
-      :router_id                        => nil,
-      :gateway_external_network_id      => nil,
       :handle_internal_only_routers     => true,
       :metadata_port                    => '9697',
       :send_arp_for_ha                  => '3',
       :periodic_interval                => '40',
       :periodic_fuzzy_delay             => '5',
       :enable_metadata_proxy            => true,
-      :network_device_mtu               => nil,
       :router_delete_namespaces         => true,
       :ha_enabled                       => false,
       :ha_vrrp_auth_type                => 'PASS',
-      :ha_vrrp_auth_password            => nil,
       :ha_vrrp_advert_int               => '3',
       :agent_mode                       => 'legacy' }
   end
 
-  let :default_facts do
+  let :test_facts do
     { :operatingsystem           => 'default',
       :operatingsystemrelease    => 'default'
     }
@@ -51,15 +46,15 @@ describe 'neutron::agents::l3' do
       is_expected.to contain_neutron_l3_agent_config('DEFAULT/debug').with_value(p[:debug])
       is_expected.to contain_neutron_l3_agent_config('DEFAULT/external_network_bridge').with_value(p[:external_network_bridge])
       is_expected.to contain_neutron_l3_agent_config('DEFAULT/interface_driver').with_value(p[:interface_driver])
-      is_expected.to contain_neutron_l3_agent_config('DEFAULT/router_id').with_value(p[:router_id])
-      is_expected.to contain_neutron_l3_agent_config('DEFAULT/gateway_external_network_id').with_value(p[:gateway_external_network_id])
+      is_expected.to contain_neutron_l3_agent_config('DEFAULT/router_id').with_value('<SERVICE DEFAULT>')
+      is_expected.to contain_neutron_l3_agent_config('DEFAULT/gateway_external_network_id').with_value('<SERVICE DEFAULT>')
       is_expected.to contain_neutron_l3_agent_config('DEFAULT/handle_internal_only_routers').with_value(p[:handle_internal_only_routers])
       is_expected.to contain_neutron_l3_agent_config('DEFAULT/metadata_port').with_value(p[:metadata_port])
       is_expected.to contain_neutron_l3_agent_config('DEFAULT/send_arp_for_ha').with_value(p[:send_arp_for_ha])
       is_expected.to contain_neutron_l3_agent_config('DEFAULT/periodic_interval').with_value(p[:periodic_interval])
       is_expected.to contain_neutron_l3_agent_config('DEFAULT/periodic_fuzzy_delay').with_value(p[:periodic_fuzzy_delay])
       is_expected.to contain_neutron_l3_agent_config('DEFAULT/enable_metadata_proxy').with_value(p[:enable_metadata_proxy])
-      is_expected.to contain_neutron_l3_agent_config('DEFAULT/network_device_mtu').with_ensure('absent')
+      is_expected.to contain_neutron_l3_agent_config('DEFAULT/network_device_mtu').with_value('<SERVICE DEFAULT>')
       is_expected.to contain_neutron_l3_agent_config('DEFAULT/router_delete_namespaces').with_value(p[:router_delete_namespaces])
     end
 
@@ -141,7 +136,9 @@ describe 'neutron::agents::l3' do
 
   context 'on Debian platforms' do
     let :facts do
-      default_facts.merge({ :osfamily => 'Debian' })
+      @default_facts.merge(test_facts.merge({
+         :osfamily => 'Debian'
+      }))
     end
 
     let :platform_params do
@@ -158,10 +155,10 @@ describe 'neutron::agents::l3' do
 
   context 'on RedHat platforms' do
     let :facts do
-      default_facts.merge({
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '7'
-      })
+      @default_facts.merge(test_facts.merge({
+         :osfamily               => 'RedHat',
+         :operatingsystemrelease => '7'
+      }))
     end
 
     let :platform_params do
diff --git a/spec/classes/neutron_agents_lbaas_spec.rb b/spec/classes/neutron_agents_lbaas_spec.rb
index 8f3e2784c..6e8d9b394 100644
--- a/spec/classes/neutron_agents_lbaas_spec.rb
+++ b/spec/classes/neutron_agents_lbaas_spec.rb
@@ -21,7 +21,7 @@ describe 'neutron::agents::lbaas' do
     }
   end
 
-  let :default_facts do
+  let :test_facts do
     { :operatingsystem           => 'default',
       :operatingsystemrelease    => 'default'
     }
@@ -114,11 +114,11 @@ describe 'neutron::agents::lbaas' do
 
   context 'on Debian platforms' do
     let :facts do
-      default_facts.merge(
+      @default_facts.merge(test_facts.merge(
         { :osfamily => 'Debian',
           :concat_basedir => '/dne'
         }
-      )
+      ))
     end
 
     let :platform_params do
@@ -133,12 +133,12 @@ describe 'neutron::agents::lbaas' do
 
   context 'on RedHat platforms' do
     let :facts do
-      default_facts.merge(
-        { :osfamily               => 'RedHat',
-          :operatingsystemrelease => '7',
-          :concat_basedir         => '/dne'
-        }
-      )
+      @default_facts.merge(test_facts.merge(
+         { :osfamily               => 'RedHat',
+           :operatingsystemrelease => '7',
+           :concat_basedir         => '/dne'
+         }
+      ))
     end
 
     let :platform_params do
diff --git a/spec/classes/neutron_agents_metadata_spec.rb b/spec/classes/neutron_agents_metadata_spec.rb
index c73cf7519..5d1964ecb 100644
--- a/spec/classes/neutron_agents_metadata_spec.rb
+++ b/spec/classes/neutron_agents_metadata_spec.rb
@@ -24,7 +24,7 @@ describe 'neutron::agents::metadata' do
     }
   end
 
-  let :default_facts do
+  let :test_facts do
     { :operatingsystem           => 'default',
       :operatingsystemrelease    => 'default',
       :processorcount            => '2'
@@ -59,7 +59,7 @@ describe 'neutron::agents::metadata' do
       is_expected.to contain_neutron_metadata_agent_config('DEFAULT/debug').with(:value => params[:debug])
       is_expected.to contain_neutron_metadata_agent_config('DEFAULT/auth_url').with(:value => params[:auth_url])
       is_expected.to contain_neutron_metadata_agent_config('DEFAULT/auth_insecure').with(:value => params[:auth_insecure])
-      is_expected.to contain_neutron_metadata_agent_config('DEFAULT/auth_ca_cert').with_ensure('absent')
+      is_expected.to contain_neutron_metadata_agent_config('DEFAULT/auth_ca_cert').with(:value => '<SERVICE DEFAULT>')
       is_expected.to contain_neutron_metadata_agent_config('DEFAULT/auth_region').with(:value => params[:auth_region])
       is_expected.to contain_neutron_metadata_agent_config('DEFAULT/admin_tenant_name').with(:value => params[:auth_tenant])
       is_expected.to contain_neutron_metadata_agent_config('DEFAULT/admin_user').with(:value => params[:auth_user])
@@ -92,9 +92,9 @@ describe 'neutron::agents::metadata' do
 
   context 'on Debian platforms' do
     let :facts do
-      default_facts.merge(
+      @default_facts.merge(test_facts.merge(
         { :osfamily => 'Debian' }
-      )
+      ))
     end
 
     let :platform_params do
@@ -119,10 +119,10 @@ describe 'neutron::agents::metadata' do
 
   context 'on Red Hat platforms' do
     let :facts do
-      default_facts.merge({
-        :osfamily => 'RedHat',
-        :operatingsystemrelease => '7'
-      })
+      @default_facts.merge(test_facts.merge({
+         :osfamily => 'RedHat',
+         :operatingsystemrelease => '7'
+      }))
     end
 
     let :platform_params do
diff --git a/spec/classes/neutron_agents_metering_spec.rb b/spec/classes/neutron_agents_metering_spec.rb
index 78c67b855..417c2f65d 100644
--- a/spec/classes/neutron_agents_metering_spec.rb
+++ b/spec/classes/neutron_agents_metering_spec.rb
@@ -44,7 +44,7 @@ describe 'neutron::agents::metering' do
     }
   end
 
-  let :default_facts do
+  let :test_facts do
     { :operatingsystem           => 'default',
       :operatingsystemrelease    => 'default'
     }
@@ -117,7 +117,9 @@ describe 'neutron::agents::metering' do
 
   context 'on Debian platforms' do
     let :facts do
-      default_facts.merge({ :osfamily => 'Debian' })
+      @default_facts.merge(test_facts.merge({
+         :osfamily => 'Debian'
+      }))
     end
 
     let :platform_params do
@@ -133,10 +135,10 @@ describe 'neutron::agents::metering' do
 
   context 'on RedHat platforms' do
     let :facts do
-      default_facts.merge({
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '7'
-      })
+      @default_facts.merge(test_facts.merge({
+         :osfamily               => 'RedHat',
+         :operatingsystemrelease => '7'
+      }))
     end
 
     let :platform_params do
diff --git a/spec/classes/neutron_agents_ml2_linuxbridge_spec.rb b/spec/classes/neutron_agents_ml2_linuxbridge_spec.rb
index 96e8d7105..c67acdef8 100644
--- a/spec/classes/neutron_agents_ml2_linuxbridge_spec.rb
+++ b/spec/classes/neutron_agents_ml2_linuxbridge_spec.rb
@@ -21,7 +21,7 @@ describe 'neutron::agents::ml2::linuxbridge' do
       :firewall_driver  => 'neutron.agent.linux.iptables_firewall.IptablesFirewallDriver' }
   end
 
-  let :default_facts do
+  let :test_facts do
     { :operatingsystem           => 'default',
       :operatingsystemrelease    => 'default'
     }
@@ -149,7 +149,9 @@ describe 'neutron::agents::ml2::linuxbridge' do
 
   context 'on Debian platforms' do
     let :facts do
-      default_facts.merge({ :osfamily => 'Debian' })
+      @default_facts.merge(test_facts.merge({
+         :osfamily => 'Debian'
+      }))
     end
 
     let :platform_params do
@@ -162,10 +164,10 @@ describe 'neutron::agents::ml2::linuxbridge' do
 
   context 'on RedHat platforms' do
     let :facts do
-      default_facts.merge({
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '7'
-      })
+      @default_facts.merge(test_facts.merge({
+         :osfamily               => 'RedHat',
+         :operatingsystemrelease => '7'
+      }))
     end
 
     let :platform_params do
diff --git a/spec/classes/neutron_agents_ml2_ovs_spec.rb b/spec/classes/neutron_agents_ml2_ovs_spec.rb
index 7de739bf3..dc36cd6a3 100644
--- a/spec/classes/neutron_agents_ml2_ovs_spec.rb
+++ b/spec/classes/neutron_agents_ml2_ovs_spec.rb
@@ -25,7 +25,7 @@ describe 'neutron::agents::ml2::ovs' do
       :prevent_arp_spoofing       => true }
   end
 
-  let :default_facts do
+  let :test_facts do
     { :operatingsystem           => 'default',
       :operatingsystemrelease    => 'default'
     }
@@ -237,7 +237,9 @@ describe 'neutron::agents::ml2::ovs' do
 
   context 'on Debian platforms' do
     let :facts do
-      default_facts.merge({ :osfamily => 'Debian' })
+      @default_facts.merge(test_facts.merge({
+         :osfamily => 'Debian'
+      }))
     end
 
     let :platform_params do
@@ -250,10 +252,10 @@ describe 'neutron::agents::ml2::ovs' do
 
   context 'on RedHat platforms' do
     let :facts do
-      default_facts.merge({
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '7'
-      })
+      @default_facts.merge(test_facts.merge({
+         :osfamily               => 'RedHat',
+         :operatingsystemrelease => '7'
+      }))
     end
 
     let :platform_params do
diff --git a/spec/classes/neutron_agents_ml2_sriov_spec.rb b/spec/classes/neutron_agents_ml2_sriov_spec.rb
index 5c1034136..208c96774 100644
--- a/spec/classes/neutron_agents_ml2_sriov_spec.rb
+++ b/spec/classes/neutron_agents_ml2_sriov_spec.rb
@@ -17,7 +17,7 @@ describe 'neutron::agents::ml2::sriov' do
     }
   end
 
-  let :default_facts do
+  let :test_facts do
     { :operatingsystem           => 'default',
       :operatingsystemrelease    => 'default'
     }
@@ -86,7 +86,9 @@ describe 'neutron::agents::ml2::sriov' do
 
   context 'on Debian platforms' do
     let :facts do
-      default_facts.merge({ :osfamily => 'Debian' })
+      @default_facts.merge(test_facts.merge({
+         :osfamily => 'Debian'
+      }))
     end
 
     let :platform_params do
@@ -99,10 +101,10 @@ describe 'neutron::agents::ml2::sriov' do
 
   context 'on RedHat platforms' do
     let :facts do
-      default_facts.merge({
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '7'
-      })
+      @default_facts.merge(test_facts.merge({
+         :osfamily               => 'RedHat',
+         :operatingsystemrelease => '7'
+      }))
     end
 
     let :platform_params do
diff --git a/spec/classes/neutron_agents_vpnaas_spec.rb b/spec/classes/neutron_agents_vpnaas_spec.rb
index 3d40b6a91..22b5f0619 100644
--- a/spec/classes/neutron_agents_vpnaas_spec.rb
+++ b/spec/classes/neutron_agents_vpnaas_spec.rb
@@ -39,7 +39,7 @@ describe 'neutron::agents::vpnaas' do
     }
   end
 
-  let :default_facts do
+  let :test_facts do
     { :operatingsystem           => 'default',
       :operatingsystemrelease    => 'default'
     }
@@ -58,7 +58,7 @@ describe 'neutron::agents::vpnaas' do
       is_expected.to contain_neutron_vpnaas_agent_config('vpnagent/vpn_device_driver').with_value(p[:vpn_device_driver]);
       is_expected.to contain_neutron_vpnaas_agent_config('ipsec/ipsec_status_check_interval').with_value(p[:ipsec_status_check_interval]);
       is_expected.to contain_neutron_vpnaas_agent_config('DEFAULT/interface_driver').with_value(p[:interface_driver]);
-      is_expected.to contain_neutron_vpnaas_agent_config('DEFAULT/external_network_bridge').with_ensure('absent');
+      is_expected.to contain_neutron_vpnaas_agent_config('DEFAULT/external_network_bridge').with_value('<SERVICE DEFAULT>');
     end
 
     context 'with external_network_bridge as br-ex' do
@@ -119,7 +119,9 @@ describe 'neutron::agents::vpnaas' do
 
   context 'on Debian platforms' do
     let :facts do
-      default_facts.merge({ :osfamily => 'Debian' })
+      @default_facts.merge(test_facts.merge({
+         :osfamily => 'Debian'
+      }))
     end
 
     let :platform_params do
@@ -136,10 +138,10 @@ describe 'neutron::agents::vpnaas' do
 
   context 'on RedHat 6 platforms' do
     let :facts do
-      default_facts.merge(
+      @default_facts.merge(test_facts.merge(
         { :osfamily                  => 'RedHat',
           :operatingsystemrelease    => '6.5',
-          :operatingsystemmajrelease => 6 })
+          :operatingsystemmajrelease => 6 }))
     end
 
     let :platform_params do
@@ -153,10 +155,10 @@ describe 'neutron::agents::vpnaas' do
 
   context 'on RedHat 7 platforms' do
     let :facts do
-      default_facts.merge(
+      @default_facts.merge(test_facts.merge(
         { :osfamily                  => 'RedHat',
           :operatingsystemrelease    => '7.1.2',
-          :operatingsystemmajrelease => 7 })
+          :operatingsystemmajrelease => 7 }))
     end
 
     let :platform_params do
diff --git a/spec/classes/neutron_client_spec.rb b/spec/classes/neutron_client_spec.rb
index 0dc005722..82e5c60d5 100644
--- a/spec/classes/neutron_client_spec.rb
+++ b/spec/classes/neutron_client_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'neutron::client' do
 
-  let :default_facts do
+  let :test_facts do
     { :operatingsystem           => 'default',
       :operatingsystemrelease    => 'default'
     }
@@ -10,7 +10,9 @@ describe 'neutron::client' do
 
   context 'on Debian platforms' do
     let :facts do
-      default_facts.merge({ :osfamily => 'Debian' })
+      @default_facts.merge(test_facts.merge({
+         :osfamily => 'Debian'
+      }))
     end
 
     it { is_expected.to contain_class('neutron::client') }
@@ -18,10 +20,10 @@ describe 'neutron::client' do
 
   context 'on RedHat platforms' do
     let :facts do
-      default_facts.merge({
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '7'
-      })
+      @default_facts.merge(test_facts.merge({
+         :osfamily               => 'RedHat',
+         :operatingsystemrelease => '7'
+      }))
     end
 
     it { is_expected.to contain_class('neutron::client') }
diff --git a/spec/classes/neutron_db_postgresql_spec.rb b/spec/classes/neutron_db_postgresql_spec.rb
index d38037392..6d2bd56aa 100644
--- a/spec/classes/neutron_db_postgresql_spec.rb
+++ b/spec/classes/neutron_db_postgresql_spec.rb
@@ -10,7 +10,7 @@ describe 'neutron::db::postgresql' do
     'include postgresql::server'
   end
 
-  let :default_facts do
+  let :test_facts do
     { :operatingsystem           => 'default',
       :operatingsystemrelease    => 'default'
     }
@@ -18,11 +18,11 @@ describe 'neutron::db::postgresql' do
 
   context 'on a RedHat osfamily' do
     let :facts do
-      default_facts.merge({
+      @default_facts.merge(test_facts.merge({
         :osfamily                 => 'RedHat',
         :operatingsystemrelease   => '7.0',
         :concat_basedir => '/var/lib/puppet/concat'
-      })
+      }))
     end
 
     context 'with only required parameters' do
@@ -40,12 +40,12 @@ describe 'neutron::db::postgresql' do
 
   context 'on a Debian osfamily' do
     let :facts do
-      default_facts.merge({
+      @default_facts.merge(test_facts.merge({
         :operatingsystemrelease => '7.8',
         :operatingsystem        => 'Debian',
         :osfamily               => 'Debian',
         :concat_basedir => '/var/lib/puppet/concat'
-      })
+      }))
     end
 
     context 'with only required parameters' do
diff --git a/spec/classes/neutron_init_spec.rb b/spec/classes/neutron_init_spec.rb
index 61aebfc03..49f9a3f2d 100644
--- a/spec/classes/neutron_init_spec.rb
+++ b/spec/classes/neutron_init_spec.rb
@@ -21,7 +21,7 @@ describe 'neutron' do
     }
   end
 
-  let :default_facts do
+  let :test_facts do
     { :operatingsystem           => 'default',
       :operatingsystemrelease    => 'default'
     }
@@ -116,14 +116,14 @@ describe 'neutron' do
       is_expected.to contain_neutron_config('DEFAULT/mac_generation_retries').with_value(16)
       is_expected.to contain_neutron_config('DEFAULT/dhcp_lease_duration').with_value(86400)
       is_expected.to contain_neutron_config('DEFAULT/dhcp_agents_per_network').with_value(1)
-      is_expected.to contain_neutron_config('DEFAULT/network_device_mtu').with_ensure('absent')
+      is_expected.to contain_neutron_config('DEFAULT/network_device_mtu').with_value('<SERVICE DEFAULT>')
       is_expected.to contain_neutron_config('DEFAULT/dhcp_agent_notification').with_value(true)
       is_expected.to contain_neutron_config('DEFAULT/advertise_mtu').with_value(false)
       is_expected.to contain_neutron_config('DEFAULT/allow_bulk').with_value(true)
       is_expected.to contain_neutron_config('DEFAULT/allow_pagination').with_value(false)
       is_expected.to contain_neutron_config('DEFAULT/allow_sorting').with_value(false)
       is_expected.to contain_neutron_config('DEFAULT/allow_overlapping_ips').with_value(false)
-      is_expected.to contain_neutron_config('DEFAULT/api_extensions_path').with_value(nil)
+      is_expected.to contain_neutron_config('DEFAULT/api_extensions_path').with_value('<SERVICE DEFAULT>')
       is_expected.to contain_neutron_config('DEFAULT/control_exchange').with_value('neutron')
       is_expected.to contain_neutron_config('DEFAULT/state_path').with_value('/var/lib/neutron')
       is_expected.to contain_neutron_config('DEFAULT/lock_path').with_value('/var/lib/neutron/lock')
@@ -310,9 +310,9 @@ describe 'neutron' do
 
     it do
       is_expected.to contain_neutron_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value('true')
-      is_expected.to contain_neutron_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_ensure('absent')
-      is_expected.to contain_neutron_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_ensure('absent')
-      is_expected.to contain_neutron_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_ensure('absent')
+      is_expected.to contain_neutron_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_value('<SERVICE DEFAULT>')
+      is_expected.to contain_neutron_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_value('<SERVICE DEFAULT>')
+      is_expected.to contain_neutron_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_value('<SERVICE DEFAULT>')
       is_expected.to contain_neutron_config('oslo_messaging_rabbit/kombu_ssl_version').with_value('TLSv1')
     end
   end
@@ -327,9 +327,9 @@ describe 'neutron' do
 
     it do
       is_expected.to contain_neutron_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value('false')
-      is_expected.to contain_neutron_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_ensure('absent')
-      is_expected.to contain_neutron_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_ensure('absent')
-      is_expected.to contain_neutron_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_ensure('absent')
+      is_expected.to contain_neutron_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_value('<SERVICE DEFAULT>')
+      is_expected.to contain_neutron_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_value('<SERVICE DEFAULT>')
+      is_expected.to contain_neutron_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_value('<SERVICE DEFAULT>')
       is_expected.to contain_neutron_config('oslo_messaging_rabbit/kombu_ssl_version').with_ensure('absent')
     end
   end
@@ -502,7 +502,9 @@ describe 'neutron' do
 
   context 'on Debian platforms' do
     let :facts do
-      default_facts.merge({ :osfamily => 'Debian' })
+      @default_facts.merge(test_facts.merge({
+         :osfamily => 'Debian'
+      }))
     end
 
     let :platform_params do
@@ -514,10 +516,10 @@ describe 'neutron' do
 
   context 'on RedHat platforms' do
     let :facts do
-      default_facts.merge({
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '7'
-      })
+      @default_facts.merge(test_facts.merge({
+         :osfamily               => 'RedHat',
+         :operatingsystemrelease => '7'
+      }))
     end
 
     let :platform_params do
diff --git a/spec/classes/neutron_keystone_auth_spec.rb b/spec/classes/neutron_keystone_auth_spec.rb
index 8da3fcbb6..33c62edc9 100644
--- a/spec/classes/neutron_keystone_auth_spec.rb
+++ b/spec/classes/neutron_keystone_auth_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'neutron::keystone::auth' do
 
-  let :default_facts do
+  let :test_facts do
     { :operatingsystem           => 'default',
       :operatingsystemrelease    => 'default'
     }
@@ -47,7 +47,9 @@ describe 'neutron::keystone::auth' do
     end
 
     let :facts do
-      default_facts.merge({ :osfamily => 'Debian' })
+      @default_facts.merge(test_facts.merge({
+         :osfamily => 'Debian'
+      }))
     end
 
     let :params do
diff --git a/spec/classes/neutron_plugins_cisco_spec.rb b/spec/classes/neutron_plugins_cisco_spec.rb
index 985d51c9b..ed31f8b8c 100644
--- a/spec/classes/neutron_plugins_cisco_spec.rb
+++ b/spec/classes/neutron_plugins_cisco_spec.rb
@@ -33,7 +33,7 @@ describe 'neutron::plugins::cisco' do
     }
   end
 
-  let :default_facts do
+  let :test_facts do
     { :operatingsystem           => 'default',
       :operatingsystemrelease    => 'default'
     }
@@ -137,7 +137,9 @@ describe 'neutron::plugins::cisco' do
   end
   context 'on Debian platforms' do
     let :facts do
-      default_facts.merge({ :osfamily => 'Debian' })
+      @default_facts.merge(test_facts.merge({
+         :osfamily => 'Debian'
+      }))
     end
 
     context 'on Ubuntu operating systems' do
@@ -168,10 +170,10 @@ describe 'neutron::plugins::cisco' do
 
   context 'on RedHat platforms' do
     let :facts do
-      default_facts.merge({
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '7'
-      })
+      @default_facts.merge(test_facts.merge({
+         :osfamily               => 'RedHat',
+         :operatingsystemrelease => '7'
+      }))
     end
 
     it_configures 'default cisco plugin'
diff --git a/spec/classes/neutron_plugins_midonet_spec.rb b/spec/classes/neutron_plugins_midonet_spec.rb
index 40d9bf5cc..347c51deb 100644
--- a/spec/classes/neutron_plugins_midonet_spec.rb
+++ b/spec/classes/neutron_plugins_midonet_spec.rb
@@ -18,7 +18,7 @@ describe 'neutron::plugins::midonet' do
   }
   end
 
-  let :default_facts do
+  let :test_facts do
     { :operatingsystem           => 'default',
       :operatingsystemrelease    => 'default'
     }
@@ -53,7 +53,9 @@ describe 'neutron::plugins::midonet' do
 
   context 'on Debian platforms' do
     let :facts do
-      default_facts.merge({ :osfamily => 'Debian'})
+      @default_facts.merge(test_facts.merge({
+         :osfamily => 'Debian'
+      }))
     end
     it 'configures /etc/default/neutron-server' do
       is_expected.to contain_file_line('/etc/default/neutron-server:NEUTRON_PLUGIN_CONFIG').with(
@@ -69,10 +71,10 @@ describe 'neutron::plugins::midonet' do
 
   context 'on RedHat platforms' do
     let :facts do
-      default_facts.merge({
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '7'
-      })
+      @default_facts.merge(test_facts.merge({
+         :osfamily               => 'RedHat',
+         :operatingsystemrelease => '7'
+      }))
     end
     it_configures 'neutron midonet plugin'
   end
diff --git a/spec/classes/neutron_plugins_ml2_bigswitch_restproxy_spec.rb b/spec/classes/neutron_plugins_ml2_bigswitch_restproxy_spec.rb
index a21564086..cce07f738 100644
--- a/spec/classes/neutron_plugins_ml2_bigswitch_restproxy_spec.rb
+++ b/spec/classes/neutron_plugins_ml2_bigswitch_restproxy_spec.rb
@@ -24,7 +24,7 @@ describe 'neutron::plugins::ml2::bigswitch::restproxy' do
     required_params
   end
 
-  let :default_facts do
+  let :test_facts do
     { :operatingsystem         => 'default',
       :operatingsystemrelease  => 'default',
     }
@@ -70,10 +70,10 @@ describe 'neutron::plugins::ml2::bigswitch::restproxy' do
 
   context 'on RedHat platforms' do
     let :facts do
-      default_facts.merge({
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '7'
-      })
+      @default_facts.merge(test_facts.merge({
+         :osfamily               => 'RedHat',
+         :operatingsystemrelease => '7'
+      }))
     end
 
     it_configures 'neutron bigswitch ml2 restproxy'
diff --git a/spec/classes/neutron_plugins_ml2_bigswitch_spec.rb b/spec/classes/neutron_plugins_ml2_bigswitch_spec.rb
index 19a506d98..7d1dc92e3 100644
--- a/spec/classes/neutron_plugins_ml2_bigswitch_spec.rb
+++ b/spec/classes/neutron_plugins_ml2_bigswitch_spec.rb
@@ -19,7 +19,7 @@ describe 'neutron::plugins::ml2::bigswitch' do
     {}
   end
 
-  let :default_facts do
+  let :test_facts do
     {
       :operatingsystem        => 'default',
       :operatingsystemrelease => 'default',
@@ -44,10 +44,10 @@ describe 'neutron::plugins::ml2::bigswitch' do
 
   context 'on RedHat platforms' do
     let :facts do
-      default_facts.merge({
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '7'
-      })
+      @default_facts.merge(test_facts.merge({
+         :osfamily               => 'RedHat',
+         :operatingsystemrelease => '7'
+      }))
     end
 
     it_configures 'neutron plugin bigswitch ml2'
@@ -55,7 +55,9 @@ describe 'neutron::plugins::ml2::bigswitch' do
 
   context 'on Debian platforms' do
     let :facts do
-      default_facts.merge({:osfamily => 'Debian'})
+      @default_facts.merge(test_facts.merge({
+         :osfamily => 'Debian'
+      }))
     end
 
     it { is_expected.to raise_error(Puppet::Error, /Unsupported osfamily Debian/) }
diff --git a/spec/classes/neutron_plugins_ml2_cisco_nexus_spec.rb b/spec/classes/neutron_plugins_ml2_cisco_nexus_spec.rb
index 0fce4940b..2153004ce 100644
--- a/spec/classes/neutron_plugins_ml2_cisco_nexus_spec.rb
+++ b/spec/classes/neutron_plugins_ml2_cisco_nexus_spec.rb
@@ -47,7 +47,7 @@ describe 'neutron::plugins::ml2::cisco::nexus' do
     {}
   end
 
-  let :default_facts do
+  let :test_facts do
     { :operatingsystem         => 'default',
       :operatingsystemrelease  => 'default',
       :concat_basedir          => '/',
@@ -89,10 +89,10 @@ describe 'neutron::plugins::ml2::cisco::nexus' do
   begin
     context 'on RedHat platforms' do
       let :facts do
-        default_facts.merge({
-          :osfamily               => 'RedHat',
-          :operatingsystemrelease => '7'
-        })
+        @default_facts.merge(test_facts.merge({
+           :osfamily               => 'RedHat',
+           :operatingsystemrelease => '7'
+        }))
       end
 
       let :platform_params do
diff --git a/spec/classes/neutron_plugins_ml2_cisco_spec.rb b/spec/classes/neutron_plugins_ml2_cisco_spec.rb
index 3fa810b33..5b227c7d7 100644
--- a/spec/classes/neutron_plugins_ml2_cisco_spec.rb
+++ b/spec/classes/neutron_plugins_ml2_cisco_spec.rb
@@ -19,7 +19,7 @@ describe 'neutron::plugins::ml2::cisco' do
     {}
   end
 
-  let :default_facts do
+  let :test_facts do
     {
       :operatingsystem        => 'default',
       :operatingsystemrelease => 'default',
@@ -46,10 +46,10 @@ describe 'neutron::plugins::ml2::cisco' do
   begin
     context 'on RedHat platforms' do
       let :facts do
-        default_facts.merge({
-          :osfamily               => 'RedHat',
-          :operatingsystemrelease => '7'
-        })
+        @default_facts.merge(test_facts.merge({
+           :osfamily               => 'RedHat',
+           :operatingsystemrelease => '7'
+        }))
       end
 
       it_configures 'neutron plugin cisco ml2'
diff --git a/spec/classes/neutron_plugins_ml2_cisco_type_nexus_vxlan_spec.rb b/spec/classes/neutron_plugins_ml2_cisco_type_nexus_vxlan_spec.rb
index 392de5980..89765fc73 100644
--- a/spec/classes/neutron_plugins_ml2_cisco_type_nexus_vxlan_spec.rb
+++ b/spec/classes/neutron_plugins_ml2_cisco_type_nexus_vxlan_spec.rb
@@ -24,7 +24,7 @@ describe 'neutron::plugins::ml2::cisco::type_nexus_vxlan' do
     {}
   end
 
-  let :default_facts do
+  let :test_facts do
     { :operatingsystem         => 'default',
       :operatingsystemrelease  => 'default',
       :concat_basedir          => '/',
@@ -49,10 +49,10 @@ describe 'neutron::plugins::ml2::cisco::type_nexus_vxlan' do
   begin
     context 'on RedHat platforms' do
       let :facts do
-        default_facts.merge({
-          :osfamily               => 'RedHat',
-          :operatingsystemrelease => '7'
-        })
+        @default_facts.merge(test_facts.merge({
+           :osfamily               => 'RedHat',
+           :operatingsystemrelease => '7'
+        }))
       end
 
       it_configures 'neutron cisco ml2 type nexus vxlan plugin'
diff --git a/spec/classes/neutron_plugins_ml2_cisco_ucsm_spec.rb b/spec/classes/neutron_plugins_ml2_cisco_ucsm_spec.rb
index a97df0f30..33da6eb59 100644
--- a/spec/classes/neutron_plugins_ml2_cisco_ucsm_spec.rb
+++ b/spec/classes/neutron_plugins_ml2_cisco_ucsm_spec.rb
@@ -27,7 +27,7 @@ describe 'neutron::plugins::ml2::cisco::ucsm' do
     {}
   end
 
-  let :default_facts do
+  let :test_facts do
     { :operatingsystem         => 'default',
       :operatingsystemrelease  => 'default',
       :concat_basedir          => '/',
@@ -55,10 +55,11 @@ describe 'neutron::plugins::ml2::cisco::ucsm' do
   begin
     context 'on RedHat platforms' do
       let :facts do
-        default_facts.merge({
-          :osfamily => 'RedHat',
-          :operatingsystemrelease => '7'
-        })
+        @default_facts.merge(test_facts.merge({
+           :osfamily => 'RedHat',
+           :operatingsystemrelease => '7',
+           :osfamily => 'RedHat'
+        }))
       end
 
       it_configures 'neutron cisco ml2 ucsm plugin'
diff --git a/spec/classes/neutron_plugins_ml2_spec.rb b/spec/classes/neutron_plugins_ml2_spec.rb
index c9efad62f..4d86e43a4 100644
--- a/spec/classes/neutron_plugins_ml2_spec.rb
+++ b/spec/classes/neutron_plugins_ml2_spec.rb
@@ -42,7 +42,7 @@ describe 'neutron::plugins::ml2' do
       :package_ensure        => 'present' }
   end
 
-  let :default_facts do
+  let :test_facts do
     { :operatingsystem           => 'default',
       :operatingsystemrelease    => 'default'
     }
@@ -239,7 +239,9 @@ describe 'neutron::plugins::ml2' do
 
   context 'on Debian platforms' do
     let :facts do
-      default_facts.merge({ :osfamily => 'Debian' })
+      @default_facts.merge(test_facts.merge({
+         :osfamily => 'Debian'
+      }))
     end
 
     let :platform_params do
@@ -266,10 +268,10 @@ describe 'neutron::plugins::ml2' do
 
   context 'on RedHat platforms' do
     let :facts do
-      default_facts.merge({
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '7'
-      })
+      @default_facts.merge(test_facts.merge({
+         :osfamily               => 'RedHat',
+         :operatingsystemrelease => '7'
+      }))
     end
 
     let :platform_params do
diff --git a/spec/classes/neutron_plugins_nuage_spec.rb b/spec/classes/neutron_plugins_nuage_spec.rb
index 45114718c..a159006fe 100644
--- a/spec/classes/neutron_plugins_nuage_spec.rb
+++ b/spec/classes/neutron_plugins_nuage_spec.rb
@@ -9,7 +9,7 @@ describe 'neutron::plugins::nuage' do
      class { 'neutron::server': auth_password => 'password' }"
   end
 
-  let :default_facts do
+  let :test_facts do
     { :operatingsystem           => 'default',
       :operatingsystemrelease    => 'default'
     }
@@ -54,7 +54,9 @@ describe 'neutron::plugins::nuage' do
   begin
     context 'on Debian platforms' do
       let :facts do
-        default_facts.merge({ :osfamily => 'Debian'})
+        @default_facts.merge(test_facts.merge({
+           :osfamily => 'Debian'
+        }))
       end
 
       it_configures 'neutron plugin nuage'
@@ -62,10 +64,10 @@ describe 'neutron::plugins::nuage' do
 
     context 'on RedHat platforms' do
       let :facts do
-        default_facts.merge({
-          :osfamily               => 'RedHat',
-          :operatingsystemrelease => '7'
-        })
+        @default_facts.merge(test_facts.merge({
+           :osfamily               => 'RedHat',
+           :operatingsystemrelease => '7'
+        }))
       end
 
       it_configures 'neutron plugin nuage'
@@ -74,7 +76,9 @@ describe 'neutron::plugins::nuage' do
   begin
     context 'on Debian platforms' do
       let :facts do
-        default_facts.merge({ :osfamily => 'Debian'})
+        @default_facts.merge(test_facts.merge({
+           :osfamily => 'Debian'
+        }))
       end
 
       it 'configures /etc/default/neutron-server' do
@@ -91,10 +95,10 @@ describe 'neutron::plugins::nuage' do
 
     context 'on RedHat platforms' do
       let :facts do
-        default_facts.merge({
-          :osfamily               => 'RedHat',
-          :operatingsystemrelease => '7'
-        })
+        @default_facts.merge(test_facts.merge({
+           :osfamily               => 'RedHat',
+           :operatingsystemrelease => '7'
+        }))
       end
 
       it 'should create plugin symbolic link' do
diff --git a/spec/classes/neutron_plugins_nvp_spec.rb b/spec/classes/neutron_plugins_nvp_spec.rb
index 4501722ce..af46dee76 100644
--- a/spec/classes/neutron_plugins_nvp_spec.rb
+++ b/spec/classes/neutron_plugins_nvp_spec.rb
@@ -14,7 +14,7 @@ describe 'neutron::plugins::nvp' do
         :package_ensure => 'present'}
   end
 
-  let :default_facts do
+  let :test_facts do
     { :operatingsystem           => 'default',
       :operatingsystemrelease    => 'default'
     }
@@ -93,7 +93,9 @@ describe 'neutron::plugins::nvp' do
   begin
     context 'on Debian platforms' do
       let :facts do
-        default_facts.merge({:osfamily => 'Debian'})
+        @default_facts.merge(test_facts.merge({
+           :osfamily => 'Debian'
+        }))
       end
 
       let :platform_params do
@@ -105,10 +107,10 @@ describe 'neutron::plugins::nvp' do
 
     context 'on RedHat platforms' do
       let :facts do
-        default_facts.merge({
-          :osfamily               => 'RedHat',
-          :operatingsystemrelease => '7'
-        })
+        @default_facts.merge(test_facts.merge({
+           :osfamily               => 'RedHat',
+           :operatingsystemrelease => '7'
+        }))
       end
 
       let :platform_params do
diff --git a/spec/classes/neutron_plugins_opencontrail_spec.rb b/spec/classes/neutron_plugins_opencontrail_spec.rb
index f404b4001..e453b32ba 100644
--- a/spec/classes/neutron_plugins_opencontrail_spec.rb
+++ b/spec/classes/neutron_plugins_opencontrail_spec.rb
@@ -20,7 +20,7 @@ describe 'neutron::plugins::opencontrail' do
     }
   end
 
-  let :default_facts do
+  let :test_facts do
     { :operatingsystem           => 'default',
       :operatingsystemrelease    => 'default'
     }
@@ -52,7 +52,9 @@ describe 'neutron::plugins::opencontrail' do
 
   context 'on Debian platforms' do
     let :facts do
-      default_facts.merge({ :osfamily => 'Debian' })
+      @default_facts.merge(test_facts.merge({
+         :osfamily => 'Debian'
+      }))
     end
 
     let :params do
@@ -73,10 +75,10 @@ describe 'neutron::plugins::opencontrail' do
 
   context 'on RedHat platforms' do
     let :facts do
-      default_facts.merge({
-        :osfamily => 'RedHat',
-        :operatingsystemrelease => '7'
-      })
+      @default_facts.merge(test_facts.merge({
+         :osfamily => 'RedHat',
+         :operatingsystemrelease => '7'
+      }))
     end
 
     let :params do
diff --git a/spec/classes/neutron_plugins_plumgrid_spec.rb b/spec/classes/neutron_plugins_plumgrid_spec.rb
index 0788f0a37..209d4fe2a 100644
--- a/spec/classes/neutron_plugins_plumgrid_spec.rb
+++ b/spec/classes/neutron_plugins_plumgrid_spec.rb
@@ -20,7 +20,7 @@ describe 'neutron::plugins::plumgrid' do
   }
   end
 
-  let :default_facts do
+  let :test_facts do
     { :operatingsystem           => 'default',
       :operatingsystemrelease    => 'default'
     }
@@ -51,15 +51,15 @@ describe 'neutron::plugins::plumgrid' do
     it 'should perform default configuration of plumgrid plugin' do
       is_expected.to contain_neutron_plugin_plumgrid('PLUMgridDirector/director_server').with_value(params[:director_server])
       is_expected.to contain_neutron_plugin_plumgrid('PLUMgridDirector/director_server_port').with_value(params[:director_server_port])
-      is_expected.to contain_neutron_plugin_plumgrid('PLUMgridDirector/username').with_value(params[:username])
-      is_expected.to contain_neutron_plugin_plumgrid('PLUMgridDirector/password').with_value(params[:password])
+      is_expected.to contain_neutron_plugin_plumgrid('PLUMgridDirector/username').with_value('<SERVICE DEFAULT>')
+      is_expected.to contain_neutron_plugin_plumgrid('PLUMgridDirector/password').with_value('<SERVICE DEFAULT>')
       is_expected.to contain_neutron_plugin_plumgrid('PLUMgridDirector/servertimeout').with_value(params[:servertimeout])
       is_expected.to contain_neutron_plugin_plumgrid('database/connection').with_value(params[:connection])
     end
 
     it 'should perform default configuration of plumgrid plumlib' do
       is_expected.to contain_neutron_plumlib_plumgrid('keystone_authtoken/admin_user').with_value('admin')
-      is_expected.to contain_neutron_plumlib_plumgrid('keystone_authtoken/admin_password').with_value(params[:admin_password])
+      is_expected.to contain_neutron_plumlib_plumgrid('keystone_authtoken/admin_password').with_value('<SERVICE DEFAULT>')
       is_expected.to contain_neutron_plumlib_plumgrid('keystone_authtoken/admin_tenant_name').with_value('admin')
       auth_uri = params[:auth_protocol] + "://" + params[:controller_priv_host] + ":" + "35357/v2.0";
       is_expected.to contain_neutron_plumlib_plumgrid('keystone_authtoken/auth_uri').with_value(auth_uri)
@@ -67,14 +67,16 @@ describe 'neutron::plugins::plumgrid' do
       is_expected.to contain_neutron_plumlib_plumgrid('PLUMgridMetadata/metadata_mode').with_value('local')
       is_expected.to contain_neutron_plumlib_plumgrid('PLUMgridMetadata/nova_metadata_ip').with_value(params[:nova_metadata_ip])
       is_expected.to contain_neutron_plumlib_plumgrid('PLUMgridMetadata/nova_metadata_port').with_value(params[:nova_metadata_port])
-      is_expected.to contain_neutron_plumlib_plumgrid('PLUMgridMetadata/metadata_proxy_shared_secret').with_value(params[:metadata_proxy_shared_secret])
+      is_expected.to contain_neutron_plumlib_plumgrid('PLUMgridMetadata/metadata_proxy_shared_secret').with_value('<SERVICE DEFAULT>')
     end
 
   end
 
   context 'on Debian platforms' do
     let :facts do
-      default_facts.merge({ :osfamily => 'Debian'})
+      @default_facts.merge(test_facts.merge({
+         :osfamily => 'Debian'
+      }))
     end
 
     it 'configures /etc/default/neutron-server' do
@@ -92,10 +94,10 @@ describe 'neutron::plugins::plumgrid' do
 
   context 'on RedHat platforms' do
     let :facts do
-      default_facts.merge({
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '7'
-      })
+      @default_facts.merge(test_facts.merge({
+         :osfamily               => 'RedHat',
+         :operatingsystemrelease => '7'
+      }))
     end
 
     it 'should create plugin symbolic link' do
diff --git a/spec/classes/neutron_policy_spec.rb b/spec/classes/neutron_policy_spec.rb
index 8b9a4866c..1e3e734e2 100644
--- a/spec/classes/neutron_policy_spec.rb
+++ b/spec/classes/neutron_policy_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'neutron::policy' do
 
-  let :default_facts do
+  let :test_facts do
     { :operatingsystem           => 'default',
       :operatingsystemrelease    => 'default'
     }
@@ -31,7 +31,9 @@ describe 'neutron::policy' do
 
   context 'on Debian platforms' do
     let :facts do
-      default_facts.merge({ :osfamily => 'Debian' })
+      @default_facts.merge(test_facts.merge({
+         :osfamily => 'Debian'
+      }))
     end
 
     it_configures 'neutron policies'
@@ -39,10 +41,10 @@ describe 'neutron::policy' do
 
   context 'on RedHat platforms' do
     let :facts do
-      default_facts.merge({
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '7'
-      })
+      @default_facts.merge(test_facts.merge({
+         :osfamily               => 'RedHat',
+         :operatingsystemrelease => '7'
+      }))
     end
 
     it_configures 'neutron policies'
diff --git a/spec/classes/neutron_server_notifications_spec.rb b/spec/classes/neutron_server_notifications_spec.rb
index 8045b500b..605aa9748 100644
--- a/spec/classes/neutron_server_notifications_spec.rb
+++ b/spec/classes/neutron_server_notifications_spec.rb
@@ -36,11 +36,10 @@ describe 'neutron::server::notifications' do
             :nova_admin_auth_url                => 'http://127.0.0.1:35357/v2.0',
             :nova_admin_username                => 'nova',
             :nova_admin_tenant_name             => 'services',
-            :nova_region_name                   => nil,
         }
     end
 
-    let :default_facts do
+    let :test_facts do
       { :operatingsystem           => 'default',
         :operatingsystemrelease    => 'default'
       }
@@ -48,8 +47,7 @@ describe 'neutron::server::notifications' do
 
     let :params do
         {
-            :password  => 'secrete',
-            :tenant_id => 'UUID'
+            :password  => 'secrete'
         }
     end
 
@@ -67,8 +65,9 @@ describe 'neutron::server::notifications' do
             is_expected.to contain_neutron_config('nova/username').with_value('nova')
             is_expected.to contain_neutron_config('nova/password').with_value('secrete')
             is_expected.to contain_neutron_config('nova/password').with_secret( true )
-            is_expected.to contain_neutron_config('nova/tenant_id').with_value('UUID')
-            is_expected.to contain_neutron_config('nova/region_name').with_ensure('absent')
+            is_expected.to contain_neutron_config('nova/tenant_name').with_value('services')
+            is_expected.to contain_neutron_config('nova/region_name').with_value('<SERVICE DEFAULT>')
+            is_expected.not_to contain_neutron_config('DEFAULT/nova_region_name')
             is_expected.not_to contain_neutron_config('DEFAULT/nova_admin_auth_url')
             is_expected.not_to contain_neutron_config('DEFAULT/nova_admin_username')
             is_expected.not_to contain_neutron_config('DEFAULT/nova_admin_password')
@@ -144,7 +143,6 @@ describe 'neutron::server::notifications' do
             before :each do
                 params.merge!({
                   :nova_admin_tenant_name => false,
-                  :nova_admin_tenant_id   => false,
                   :nova_admin_password    => 'secrete',
                 })
             end
@@ -156,7 +154,6 @@ describe 'neutron::server::notifications' do
             before :each do
                 params.merge!({
                   :tenant_name => false,
-                  :tenant_id   => false,
                   :password    => 'secrete',
                 })
             end
@@ -168,7 +165,6 @@ describe 'neutron::server::notifications' do
             before :each do
                 params.merge!({
                   :nova_admin_tenant_name => 'services',
-                  :nova_admin_tenant_id   => false,
                   :nova_admin_password    => 'secrete',
                   :password               => false
                 })
@@ -181,7 +177,9 @@ describe 'neutron::server::notifications' do
 
     context 'on Debian platforms' do
         let :facts do
-            default_facts.merge({ :osfamily => 'Debian' })
+            @default_facts.merge(test_facts.merge({
+               :osfamily => 'Debian'
+            }))
         end
 
         let :platform_params do
@@ -193,10 +191,10 @@ describe 'neutron::server::notifications' do
 
     context 'on RedHat platforms' do
         let :facts do
-            default_facts.merge({
-              :osfamily               => 'RedHat',
-              :operatingsystemrelease => '7'
-            })
+            @default_facts.merge(test_facts.merge({
+               :osfamily               => 'RedHat',
+               :operatingsystemrelease => '7'
+            }))
         end
 
         let :platform_params do
diff --git a/spec/classes/neutron_server_spec.rb b/spec/classes/neutron_server_spec.rb
index 0e6d10f50..e14e66dd3 100644
--- a/spec/classes/neutron_server_spec.rb
+++ b/spec/classes/neutron_server_spec.rb
@@ -38,7 +38,7 @@ describe 'neutron::server' do
     }
   end
 
-  let :default_facts do
+  let :test_facts do
     { :operatingsystem           => 'default',
       :operatingsystemrelease    => 'default'
     }
@@ -234,10 +234,10 @@ describe 'neutron::server' do
 
   describe "with custom keystone auth_uri" do
     let :facts do
-      default_facts.merge({
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '7'
-      })
+      @default_facts.merge(test_facts.merge({
+         :osfamily               => 'RedHat',
+         :operatingsystemrelease => '7'
+      }))
     end
     before do
       params.merge!({
@@ -256,10 +256,10 @@ describe 'neutron::server' do
 
   describe "with custom keystone identity_uri" do
     let :facts do
-      default_facts.merge({
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '7'
-      })
+      @default_facts.merge(test_facts.merge({
+         :osfamily               => 'RedHat',
+         :operatingsystemrelease => '7'
+      }))
     end
     before do
       params.merge!({
@@ -278,10 +278,10 @@ describe 'neutron::server' do
 
   describe "with custom keystone identity_uri and auth_uri" do
     let :facts do
-      default_facts.merge({
-        :osfamily => 'RedHat',
-        :operatingsystemrelease => '7'
-      })
+      @default_facts.merge(test_facts.merge({
+         :osfamily => 'RedHat',
+         :operatingsystemrelease => '7'
+      }))
     end
     before do
       params.merge!({
@@ -301,10 +301,10 @@ describe 'neutron::server' do
 
   describe "with custom auth region" do
     let :facts do
-      default_facts.merge({
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '7'
-      })
+      @default_facts.merge(test_facts.merge({
+         :osfamily               => 'RedHat',
+         :operatingsystemrelease => '7'
+      }))
     end
     before do
       params.merge!({
@@ -318,9 +318,10 @@ describe 'neutron::server' do
 
   context 'on Debian platforms' do
     let :facts do
-      default_facts.merge(
-        { :osfamily => 'Debian',
-          :processorcount => '2' })
+      @default_facts.merge(test_facts.merge({
+         :osfamily => 'Debian',
+         :processorcount => '2'
+      }))
     end
 
     let :platform_params do
@@ -337,11 +338,11 @@ describe 'neutron::server' do
 
   context 'on RedHat platforms' do
     let :facts do
-      default_facts.merge(
-        { :osfamily               => 'RedHat',
+      @default_facts.merge(test_facts.merge({
+          :osfamily               => 'RedHat',
           :operatingsystemrelease => '7',
           :processorcount         => '2'
-      })
+      }))
     end
 
     let :platform_params do
diff --git a/spec/classes/neutron_services_fwaas_spec.rb b/spec/classes/neutron_services_fwaas_spec.rb
index ae13d5330..5d5ae5fe0 100644
--- a/spec/classes/neutron_services_fwaas_spec.rb
+++ b/spec/classes/neutron_services_fwaas_spec.rb
@@ -25,7 +25,7 @@ describe 'neutron::services::fwaas' do
     "class { 'neutron': rabbit_password => 'passw0rd' }"
   end
 
-  let :default_facts do
+  let :test_facts do
     { :operatingsystem           => 'default',
       :operatingsystemrelease    => 'default'
     }
@@ -54,9 +54,11 @@ describe 'neutron::services::fwaas' do
 
   context 'on Ubuntu platforms' do
     let :facts do
-      default_facts.merge(
+      @default_facts.merge(test_facts.merge(
         { :osfamily        => 'Debian',
-          :operatingsystem => 'Ubuntu' })
+          :operatingsystem => 'Ubuntu'
+        }
+      ))
     end
 
     it_configures 'neutron fwaas service plugin'
@@ -72,9 +74,11 @@ describe 'neutron::services::fwaas' do
 
   context 'on Debian platforms without VPNaaS' do
     let :facts do
-      default_facts.merge(
+      @default_facts.merge(test_facts.merge(
         { :osfamily        => 'Debian',
-          :operatingsystem => 'Debian' })
+          :operatingsystem => 'Debian'
+        }
+      ))
     end
 
     it_configures 'neutron fwaas service plugin'
@@ -90,7 +94,9 @@ describe 'neutron::services::fwaas' do
 
   context 'on Debian platforms with VPNaaS' do
     let :facts do
-      default_facts.merge({ :osfamily => 'Debian' })
+      @default_facts.merge(test_facts.merge({
+         :osfamily => 'Debian'
+      }))
     end
 
     let :params do
@@ -109,10 +115,10 @@ describe 'neutron::services::fwaas' do
 
   context 'on Red Hat platforms' do
     let :facts do
-      default_facts.merge({
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '7'
-      })
+      @default_facts.merge(test_facts.merge({
+         :osfamily               => 'RedHat',
+         :operatingsystemrelease => '7'
+      }))
     end
 
     it_configures 'neutron fwaas service plugin'
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 3df4cede1..9bc7bcf96 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -5,6 +5,9 @@ require 'webmock/rspec'
 RSpec.configure do |c|
   c.alias_it_should_behave_like_to :it_configures, 'configures'
   c.alias_it_should_behave_like_to :it_raises, 'raises'
+  c.before :each do
+    @default_facts = { :os_service_default => '<SERVICE DEFAULT>' }
+  end
 end
 
 at_exit { RSpec::Puppet::Coverage.report! }