diff --git a/manifests/api.pp b/manifests/api.pp
index 9bf5855..5bb4e2b 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -5,7 +5,7 @@
 # === Parameters:
 #
 # All options are optional unless specified otherwise.
-# All options defaults to $::os_service_default and
+# All options defaults to $facts['os_service_default'] and
 # the default values from the service are used.
 #
 # === Watcher configuration
@@ -24,27 +24,27 @@
 #
 # [*port*]
 #   (Optional) The port on which the watcher API will listen.
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*max_limit*]
 #   (Optional)The maximum number of items returned in a single response from a
 #   collection resource.
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*bind_host*]
 #   (Optional) Listen IP for the watcher API server.
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*workers*]
 #   (Optional) Number of worker processors to for the Watcher API service.
-#   Defaults to $::os_workers.
+#   Defaults to $facts['os_workers'].
 #
 # [*enable_ssl_api*]
 #   (Optional) Enable the integrated stand-alone API to service requests via HTTPS instead
 #   of HTTP. If there is a front-end service performing HTTPS offloading from the
 #   service, this option should be False; note, you will want to change public
 #   API endpoint to represent SSL termination URL with 'public_endpoint' option.
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*service_name*]
 #   (optional) Name of the service that will be providing the
@@ -75,11 +75,11 @@ class watcher::api (
   $package_ensure     = 'present',
   $enabled            = true,
   $manage_service     = true,
-  $port               = $::os_service_default,
-  $max_limit          = $::os_service_default,
-  $bind_host          = $::os_service_default,
-  $workers            = $::os_workers,
-  $enable_ssl_api     = $::os_service_default,
+  $port               = $facts['os_service_default'],
+  $max_limit          = $facts['os_service_default'],
+  $bind_host          = $facts['os_service_default'],
+  $workers            = $facts['os_workers'],
+  $enable_ssl_api     = $facts['os_service_default'],
   $service_name       = $::watcher::params::api_service_name,
   $create_db_schema   = false,
   $upgrade_db         = false,
diff --git a/manifests/applier.pp b/manifests/applier.pp
index 5849a35..15b1796 100644
--- a/manifests/applier.pp
+++ b/manifests/applier.pp
@@ -16,35 +16,35 @@
 #
 # [*applier_workers*]
 #   (Optional) Number of workers for watcher applier service.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*applier_conductor_topic*]
 #   (Optional) The topic name used forcontrol events, this topic used
 #   for rpc call
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*applier_status_topic*]
 #   (Optional) The topic name used for status events, this topic is used
 #   so as to notifythe others components of the system
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*applier_publisher_id*]
 #   (Optional) The identifier used by watcher module on the message broker
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*applier_workflow_engine*]
 #   (Optional) Select the engine to use to execute the workflow
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 class watcher::applier (
   $package_ensure          = 'present',
   $enabled                 = true,
   $manage_service          = true,
-  $applier_workers         = $::os_service_default,
-  $applier_conductor_topic = $::os_service_default,
-  $applier_status_topic    = $::os_service_default,
-  $applier_publisher_id    = $::os_service_default,
-  $applier_workflow_engine = $::os_service_default,
+  $applier_workers         = $facts['os_service_default'],
+  $applier_conductor_topic = $facts['os_service_default'],
+  $applier_status_topic    = $facts['os_service_default'],
+  $applier_publisher_id    = $facts['os_service_default'],
+  $applier_workflow_engine = $facts['os_service_default'],
 ) {
 
   include watcher::params
diff --git a/manifests/cache.pp b/manifests/cache.pp
index 9d21d26..42b7713 100644
--- a/manifests/cache.pp
+++ b/manifests/cache.pp
@@ -9,99 +9,99 @@
 #   the cache region. This should not need to be changed unless there
 #   is another dogpile.cache region with the same configuration name.
 #   (string value)
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*expiration_time*]
 #   (Optional) Default TTL, in seconds, for any cached item in the
 #   dogpile.cache region. This applies to any cached method that
 #   doesn't have an explicit cache expiration time defined for it.
 #   (integer value)
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*backend*]
 #   (Optional) Dogpile.cache backend module. It is recommended that
 #   Memcache with pooling (oslo_cache.memcache_pool) or Redis
 #   (dogpile.cache.redis) be used in production deployments. (string value)
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*backend_argument*]
 #   (Optional) Arguments supplied to the backend module. Specify this option
 #   once per argument to be passed to the dogpile.cache backend.
 #   Example format: "<argname>:<value>". (list value)
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*proxies*]
 #   (Optional) Proxy classes to import that will affect the way the
 #   dogpile.cache backend functions. See the dogpile.cache documentation on
 #   changing-backend-behavior. (list value)
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*enabled*]
 #   (Optional) Global toggle for caching. (boolean value)
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*debug_cache_backend*]
 #   (Optional) Extra debugging from the cache backend (cache keys,
 #   get/set/delete/etc calls). This is only really useful if you need
 #   to see the specific cache-backend get/set/delete calls with the keys/values.
 #   Typically this should be left set to false. (boolean value)
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*memcache_servers*]
 #   (Optional) Memcache servers in the format of "host:port".
 #   (dogpile.cache.memcache and oslo_cache.memcache_pool backends only).
 #   (list value)
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*memcache_dead_retry*]
 #   (Optional) Number of seconds memcached server is considered dead before
 #   it is tried again. (dogpile.cache.memcache and oslo_cache.memcache_pool
 #   backends only). (integer value)
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*memcache_socket_timeout*]
 #   (Optional) Timeout in seconds for every call to a server.
 #   (dogpile.cache.memcache and oslo_cache.memcache_pool backends only).
 #   (floating point value)
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*enable_socket_keepalive*]
 #   (Optional) Global toggle for the socket keepalive of dogpile's
 #   pymemcache backend
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*socket_keepalive_idle*]
 #   (Optional) The time (in seconds) the connection needs to remain idle
 #   before TCP starts sending keepalive probes. Should be a positive integer
 #   most greater than zero.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*socket_keepalive_interval*]
 #   (Optional) The time (in seconds) between individual keepalive probes.
 #   Should be a positive integer most greater than zero.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*socket_keepalive_count*]
 #   (Optional) The maximum number of keepalive probes TCP should send before
 #   dropping the connection. Should be a positive integer most greater than
 #   zero.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*memcache_pool_maxsize*]
 #   (Optional) Max total number of open connections to every memcached server.
 #   (oslo_cache.memcache_pool backend only). (integer value)
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*memcache_pool_unused_timeout*]
 #   (Optional) Number of seconds a connection to memcached is held unused
 #   in the pool before it is closed. (oslo_cache.memcache_pool backend only)
 #   (integer value)
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*memcache_pool_connection_get_timeout*]
 #   (Optional) Number of seconds that an operation will wait to get a memcache
 #   client connection. (integer value)
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*manage_backend_package*]
 #   (Optional) Whether to install the backend package for the cache.
@@ -110,13 +110,13 @@
 # [*tls_enabled*]
 #   (Optional) Global toggle for TLS usage when comunicating with
 #   the caching servers.
-#   Default to $::os_service_default
+#   Default to $facts['os_service_default']
 #
 # [*tls_cafile*]
 #   (Optional) Path to a file of concatenated CA certificates in PEM
 #   format necessary to establish the caching server's authenticity.
 #   If tls_enabled is False, this option is ignored.
-#   Default to $::os_service_default
+#   Default to $facts['os_service_default']
 #
 # [*tls_certfile*]
 #   (Optional) Path to a single file in PEM format containing the
@@ -124,83 +124,83 @@
 #   needed to establish the certificate's authenticity. This file
 #   is only required when client side authentication is necessary.
 #   If tls_enabled is False, this option is ignored.
-#   Default to $::os_service_default
+#   Default to $facts['os_service_default']
 #
 # [*tls_keyfile*]
 #   (Optional) Path to a single file containing the client's private
 #   key in. Otherwhise the private key will be taken from the file
 #   specified in tls_certfile. If tls_enabled is False, this option
 #   is ignored.
-#   Default to $::os_service_default
+#   Default to $facts['os_service_default']
 #
 # [*tls_allowed_ciphers*]
 #   (Optional) Set the available ciphers for sockets created with
 #   the TLS context. It should be a string in the OpenSSL cipher
 #   list format. If not specified, all OpenSSL enabled ciphers will
 #   be available.
-#   Default to $::os_service_default
+#   Default to $facts['os_service_default']
 #
 # [*enable_retry_client*]
 #   (Optional) Enable retry client mechanisms to handle failure.
 #   Those mechanisms can be used to wrap all kind of pymemcache
 #   clients. The wrapper allows you to define how many attempts
 #   to make and how long to wait between attemots.
-#   Default to $::os_service_default
+#   Default to $facts['os_service_default']
 #
 # [*retry_attempts*]
 #   (Optional) Number of times to attempt an action before failing.
-#   Default to $::os_service_default
+#   Default to $facts['os_service_default']
 #
 # [*retry_delay*]
 #   (Optional) Number of seconds to sleep between each attempt.
-#   Default to $::os_service_default
+#   Default to $facts['os_service_default']
 #
 # [*hashclient_retry_attempts*]
 #   (Optional) Amount of times a client should be tried
 #   before it is marked dead and removed from the pool in
 #   the HashClient's internal mechanisms.
-#   Default to $::os_service_default
+#   Default to $facts['os_service_default']
 #
 # [*hashclient_retry_delay*]
 #   (Optional) Time in seconds that should pass between
 #   retry attempts in the HashClient's internal mechanisms.
-#   Default to $::os_service_default
+#   Default to $facts['os_service_default']
 #
 # [*dead_timeout*]
 #   (Optional) Time in seconds before attempting to add a node
 #   back in the pool in the HashClient's internal mechanisms.
-#   Default to $::os_service_default
+#   Default to $facts['os_service_default']
 #
 class watcher::cache (
-  $config_prefix                        = $::os_service_default,
-  $expiration_time                      = $::os_service_default,
-  $backend                              = $::os_service_default,
-  $backend_argument                     = $::os_service_default,
-  $proxies                              = $::os_service_default,
-  $enabled                              = $::os_service_default,
-  $debug_cache_backend                  = $::os_service_default,
-  $memcache_servers                     = $::os_service_default,
-  $memcache_dead_retry                  = $::os_service_default,
-  $memcache_socket_timeout              = $::os_service_default,
-  $enable_socket_keepalive              = $::os_service_default,
-  $socket_keepalive_idle                = $::os_service_default,
-  $socket_keepalive_interval            = $::os_service_default,
-  $socket_keepalive_count               = $::os_service_default,
-  $memcache_pool_maxsize                = $::os_service_default,
-  $memcache_pool_unused_timeout         = $::os_service_default,
-  $memcache_pool_connection_get_timeout = $::os_service_default,
+  $config_prefix                        = $facts['os_service_default'],
+  $expiration_time                      = $facts['os_service_default'],
+  $backend                              = $facts['os_service_default'],
+  $backend_argument                     = $facts['os_service_default'],
+  $proxies                              = $facts['os_service_default'],
+  $enabled                              = $facts['os_service_default'],
+  $debug_cache_backend                  = $facts['os_service_default'],
+  $memcache_servers                     = $facts['os_service_default'],
+  $memcache_dead_retry                  = $facts['os_service_default'],
+  $memcache_socket_timeout              = $facts['os_service_default'],
+  $enable_socket_keepalive              = $facts['os_service_default'],
+  $socket_keepalive_idle                = $facts['os_service_default'],
+  $socket_keepalive_interval            = $facts['os_service_default'],
+  $socket_keepalive_count               = $facts['os_service_default'],
+  $memcache_pool_maxsize                = $facts['os_service_default'],
+  $memcache_pool_unused_timeout         = $facts['os_service_default'],
+  $memcache_pool_connection_get_timeout = $facts['os_service_default'],
   $manage_backend_package               = true,
-  $tls_enabled                          = $::os_service_default,
-  $tls_cafile                           = $::os_service_default,
-  $tls_certfile                         = $::os_service_default,
-  $tls_keyfile                          = $::os_service_default,
-  $tls_allowed_ciphers                  = $::os_service_default,
-  $enable_retry_client                  = $::os_service_default,
-  $retry_attempts                       = $::os_service_default,
-  $retry_delay                          = $::os_service_default,
-  $hashclient_retry_attempts            = $::os_service_default,
-  $hashclient_retry_delay               = $::os_service_default,
-  $dead_timeout                         = $::os_service_default,
+  $tls_enabled                          = $facts['os_service_default'],
+  $tls_cafile                           = $facts['os_service_default'],
+  $tls_certfile                         = $facts['os_service_default'],
+  $tls_keyfile                          = $facts['os_service_default'],
+  $tls_allowed_ciphers                  = $facts['os_service_default'],
+  $enable_retry_client                  = $facts['os_service_default'],
+  $retry_attempts                       = $facts['os_service_default'],
+  $retry_delay                          = $facts['os_service_default'],
+  $hashclient_retry_attempts            = $facts['os_service_default'],
+  $hashclient_retry_delay               = $facts['os_service_default'],
+  $dead_timeout                         = $facts['os_service_default'],
 ) {
 
   include watcher::deps
diff --git a/manifests/cinder_client.pp b/manifests/cinder_client.pp
index c415c62..a523e9a 100644
--- a/manifests/cinder_client.pp
+++ b/manifests/cinder_client.pp
@@ -6,21 +6,21 @@
 #
 # [*api_version*]
 #  (Optional) Version of Cinder API to use in cinderclient.
-#  Defaults to $::os_service_default
+#  Defaults to $facts['os_service_default']
 #
 # [*endpoint_type*]
 #  (Optional) Type of endpoint to use in cinderclient.
-#  Defaults to $::os_service_default
+#  Defaults to $facts['os_service_default']
 #
 # [*region_name*]
 #  (Optional) Region in Identify service catalog to use for communication
 #  with the OpenStack service.
-#  Defaults to $::os_service_default.
+#  Defaults to $facts['os_service_default'].
 #
 class watcher::cinder_client (
-  $api_version   = $::os_service_default,
-  $endpoint_type = $::os_service_default,
-  $region_name   = $::os_service_default,
+  $api_version   = $facts['os_service_default'],
+  $endpoint_type = $facts['os_service_default'],
+  $region_name   = $facts['os_service_default'],
 ) {
 
   include watcher::deps
diff --git a/manifests/db.pp b/manifests/db.pp
index 1568890..7b252ed 100644
--- a/manifests/db.pp
+++ b/manifests/db.pp
@@ -10,49 +10,49 @@
 #
 # [*database_connection_recycle_time*]
 #   (Optional) Timeout when db connections should be reaped.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*database_db_max_retries*]
 #   (optional) Maximum retries in case of connection error or deadlock error
 #   before error is raised. Set to -1 to specify an infinite retry count.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*database_max_retries*]
 #   (Optional) Maximum number of database connection retries during startup.
 #   Setting -1 implies an infinite retry count.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*database_retry_interval*]
 #   (Optional) Interval between retries of opening a database connection.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*database_max_pool_size*]
 #   (Optional) Maximum number of SQL connections to keep open in a pool.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*database_max_overflow*]
 #   (Optional) If set, use this value for max_overflow with sqlalchemy.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*database_pool_timeout*]
 #   (Optional) If set, use this value for pool_timeout with SQLAlchemy.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*mysql_enable_ndb*]
 #   (Optional) If True, transparently enables support for handling MySQL
 #   Cluster (NDB).
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 class watcher::db (
   $database_connection              = 'sqlite:////var/lib/watcher/watcher.sqlite',
-  $database_connection_recycle_time = $::os_service_default,
-  $database_max_pool_size           = $::os_service_default,
-  $database_db_max_retries          = $::os_service_default,
-  $database_max_retries             = $::os_service_default,
-  $database_retry_interval          = $::os_service_default,
-  $database_max_overflow            = $::os_service_default,
-  $database_pool_timeout            = $::os_service_default,
-  $mysql_enable_ndb                 = $::os_service_default,
+  $database_connection_recycle_time = $facts['os_service_default'],
+  $database_max_pool_size           = $facts['os_service_default'],
+  $database_db_max_retries          = $facts['os_service_default'],
+  $database_max_retries             = $facts['os_service_default'],
+  $database_retry_interval          = $facts['os_service_default'],
+  $database_max_overflow            = $facts['os_service_default'],
+  $database_pool_timeout            = $facts['os_service_default'],
+  $mysql_enable_ndb                 = $facts['os_service_default'],
 ) {
 
   include watcher::deps
diff --git a/manifests/decision_engine.pp b/manifests/decision_engine.pp
index e40d7fb..414e4d5 100644
--- a/manifests/decision_engine.pp
+++ b/manifests/decision_engine.pp
@@ -17,35 +17,35 @@
 # [*decision_engine_conductor_topic*]
 #   (Optional) The topic name used forcontrol events, this topic used
 #   for rpc call
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*decision_engine_status_topic*]
 #   (Optional) The topic name used for status events, this topic is used
 #   so as to notifythe others components of the system
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*decision_engine_notification_topics*]
 #   (Optional) The topic names from which notification events will be
 #   listened to (list value)
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*decision_engine_publisher_id*]
 #   (Optional) The identifier used by watcher module on the message broker
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*decision_engine_workers*]
 #   (Optional) The maximum number of threads that can be used to execute
 #   strategies
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*planner*]
 #   (Optional) The selected planner used to schedule the actions (string value)
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*weights*]
 #   (Optional) Hash of weights used to schedule the actions (dict value).
 #   The key is an action, value is an order number.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #   Example:
 #     { 'change_nova_service_state' => '2',
 #       'migrate' => '3', 'nop' => '0', 'sleep' => '1' }
@@ -55,13 +55,13 @@ class watcher::decision_engine (
   $package_ensure                      = 'present',
   $enabled                             = true,
   $manage_service                      = true,
-  $decision_engine_conductor_topic     = $::os_service_default,
-  $decision_engine_status_topic        = $::os_service_default,
-  $decision_engine_notification_topics = $::os_service_default,
-  $decision_engine_publisher_id        = $::os_service_default,
-  $decision_engine_workers             = $::os_service_default,
-  $planner                             = $::os_service_default,
-  $weights                             = $::os_service_default,
+  $decision_engine_conductor_topic     = $facts['os_service_default'],
+  $decision_engine_status_topic        = $facts['os_service_default'],
+  $decision_engine_notification_topics = $facts['os_service_default'],
+  $decision_engine_publisher_id        = $facts['os_service_default'],
+  $decision_engine_workers             = $facts['os_service_default'],
+  $planner                             = $facts['os_service_default'],
+  $weights                             = $facts['os_service_default'],
 ) {
 
   include watcher::params
diff --git a/manifests/glance_client.pp b/manifests/glance_client.pp
index 146a6b6..6a79454 100644
--- a/manifests/glance_client.pp
+++ b/manifests/glance_client.pp
@@ -6,21 +6,21 @@
 #
 # [*api_version*]
 #  (Optional) Version of Glance API to use in glanceclient.
-#  Defaults to $::os_service_default
+#  Defaults to $facts['os_service_default']
 #
 # [*endpoint_type*]
 #  (Optional) Type of endpoint to use in glanceclient.
-#  Defaults to $::os_service_default
+#  Defaults to $facts['os_service_default']
 #
 # [*region_name*]
 #  (Optional) Region in Identify service catalog to use for communication
 #  with the OpenStack service.
-#  Defaults to $::os_service_default.
+#  Defaults to $facts['os_service_default'].
 #
 class watcher::glance_client (
-  $api_version   = $::os_service_default,
-  $endpoint_type = $::os_service_default,
-  $region_name   = $::os_service_default,
+  $api_version   = $facts['os_service_default'],
+  $endpoint_type = $facts['os_service_default'],
+  $region_name   = $facts['os_service_default'],
 ) {
 
   include watcher::deps
diff --git a/manifests/gnocchi_client.pp b/manifests/gnocchi_client.pp
index b11bb5a..24a3a05 100644
--- a/manifests/gnocchi_client.pp
+++ b/manifests/gnocchi_client.pp
@@ -6,21 +6,21 @@
 #
 # [*api_version*]
 #  (Optional) Version of Gnocchi API to use in gnocchiclient.
-#  Defaults to $::os_service_default
+#  Defaults to $facts['os_service_default']
 #
 # [*endpoint_type*]
 #  (Optional) Type of endpoint to use in gnocchiclient.
-#  Defaults to $::os_service_default
+#  Defaults to $facts['os_service_default']
 #
 # [*region_name*]
 #  (Optional) Region in Identify service catalog to use for communication
 #  with the OpenStack service.
-#  Defaults to $::os_service_default.
+#  Defaults to $facts['os_service_default'].
 #
 class watcher::gnocchi_client (
-  $api_version   = $::os_service_default,
-  $endpoint_type = $::os_service_default,
-  $region_name   = $::os_service_default,
+  $api_version   = $facts['os_service_default'],
+  $endpoint_type = $facts['os_service_default'],
+  $region_name   = $facts['os_service_default'],
 ) {
 
   include watcher::deps
diff --git a/manifests/init.pp b/manifests/init.pp
index 8f5717a..ef4f809 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -14,30 +14,30 @@
 #
 # [*rabbit_login_method*]
 #   (optional) The RabbitMQ login method. (string value)
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*rabbit_retry_interval*]
 #   (Optional) How frequently to retry connecting with RabbitMQ.
 #   (integer value)
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*rabbit_retry_backoff*]
 #   (Optional) How long to backoff for between retries when connecting
 #   to RabbitMQ. (integer value)
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*rabbit_interval_max*]
 #   (Optional) Maximum interval of RabbitMQ connection retries. (integer value)
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*rabbit_use_ssl*]
 #   (optional) Connect over SSL for RabbitMQ.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*rabbit_heartbeat_rate*]
 #   (optional) ow often times during the heartbeat_timeout_threshold we
 #   check the heartbeat.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*rabbit_heartbeat_in_pthread*]
 #   (Optional) EXPERIMENTAL: Run the health check heartbeat thread
@@ -47,12 +47,12 @@
 #   example if the parent process have monkey patched the
 #   stdlib by using eventlet/greenlet then the heartbeat
 #   will be run through a green thread.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*rabbit_ha_queues*]
 #   (optional) Use HA queues in RabbitMQ (x-ha-policy: all). If you change this
 #   option, you must wipe the RabbitMQ database.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*rabbit_transient_queues_ttl*]
 #   (Optional) Positive integer representing duration in seconds for
@@ -60,148 +60,148 @@
 #   of the TTL are automatically deleted.
 #   The parameter affects only reply and fanout queues. (integer value)
 #   Min to 1
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*rabbit_heartbeat_timeout_threshold*]
 #   (Optional) Number of seconds after which the Rabbit broker is
 #   considered down if heartbeat's keep-alive fails
 #   (0 disable the heartbeat). EXPERIMENTAL. (integer value)
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*kombu_ssl_ca_certs*]
 #   (optional) SSL certification authority file (valid only if SSL enabled).
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*kombu_ssl_certfile*]
 #   (optional) SSL cert file (valid only if SSL enabled).
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*kombu_ssl_keyfile*]
 #   (optional) SSL key file (valid only if SSL enabled).
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*kombu_ssl_version*]
 #   (optional) SSL version to use (valid only if SSL enabled). Valid values are
 #   TLSv1 and SSLv23. SSLv2, SSLv3, TLSv1_1, and TLSv1_2 may be
 #   available on some distributions.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*kombu_reconnect_delay*]
 #   (optional) How long to wait before reconnecting in response to an AMQP
 #   consumer cancel notification.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*kombu_missing_consumer_retry_timeout*]
 #  (optional)How long to wait a missing client beforce abandoning to send it
 #   its replies. This value should not be longer than rpc_response_timeout.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*kombu_failover_strategy*]
 #   (Optional) Determines how the next RabbitMQ node is chosen in case the one
 #   we are currently connected to becomes unavailable. Takes effect only if
 #   more than one RabbitMQ node is provided in config. (string value)
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*kombu_compression*]
 #   (optional) Possible values are: gzip, bz2. If not set compression will not
 #   be used. This option may notbe available in future versions. EXPERIMENTAL.
 #   (string value)
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*amqp_durable_queues*]
 #   (optional) Use durable queues in AMQP.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*default_transport_url*]
 #   (Optional) A URL representing the messaging driver to use and its full
 #   configuration. If not set, we fall back to the rpc_backend option
 #   and driver specific configuration.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*rpc_response_timeout*]
 #  (Optional) Seconds to wait for a response from a call.
-#  Defaults to $::os_service_default
+#  Defaults to $facts['os_service_default']
 #
 # [*control_exchange*]
 #   (Optional) The default exchange under which topics are scoped. May be
 #   overridden by an exchange name specified in the transport_url
 #   option.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*amqp_password*]
 #   (Optional) Password for message broker authentication.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*amqp_username*]
 #   (Optional) User name for message broker authentication.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*amqp_ssl_ca_file*]
 #   (Optional) CA certificate PEM file to verify server certificate.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*amqp_ssl_key_file*]
 #   (Optional) Private key PEM file used to sign cert_file certificate.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*amqp_container_name*]
 #   (Optional) Name for the AMQP container.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*amqp_sasl_mechanisms*]
 #   (Optional) Space separated list of acceptable SASL mechanisms.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*amqp_server_request_prefix*]
 #   (Optional) Address prefix used when sending to a specific server.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*amqp_ssl_key_password*]
 #   (Optional) Password for decrypting ssl_key_file (if encrypted).
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*amqp_idle_timeout*]
 #   (Optional) Timeout for inactive connections (in seconds).
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*amqp_ssl_cert_file*]
 #   (Optional) Identifying certificate PEM file to present to clients.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*amqp_broadcast_prefix*]
 #   (Optional) Address prefix used when broadcasting to all servers.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*amqp_trace*]
 #   (Optional) Debug: dump AMQP frames to stdout.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*amqp_sasl_config_name*]
 #   (Optional) Name of configuration file (without .conf suffix).
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*amqp_sasl_config_dir*]
 #   (Optional) Path to directory that contains the SASL configuration.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*amqp_group_request_prefix*]
 #   (Optional) Address prefix when sending to any server in group.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*notification_transport_url*]
 #  (optional) A URL representing the messaging driver to use for notifications
 #  and its full configuration. Transport URLs take the form:
 #    transport://user:pass@host1:port[,hostN:portN]/virtual_host
-#  Defaults to $::os_service_default
+#  Defaults to $facts['os_service_default']
 #
 # [*notification_driver*]
 #  (optional) Driver or drivers to handle sending notifications.
 #  Value can be a string or a list.
-#  Defaults to $::os_service_default
+#  Defaults to $facts['os_service_default']
 #
 # [*notification_topics*]
 #  (optional) AMQP topic used for OpenStack notifications
-#  Defaults to $::os_service_default
+#  Defaults to $facts['os_service_default']
 #
 # [*purge_config*]
 #   (optional) Whether to set only the specified config options
@@ -216,48 +216,48 @@ class watcher (
   $purge_config                         = false,
   $use_ssl                              = false,
   $package_ensure                       = 'present',
-  $rabbit_login_method                  = $::os_service_default,
-  $rabbit_retry_interval                = $::os_service_default,
-  $rabbit_retry_backoff                 = $::os_service_default,
-  $rabbit_interval_max                  = $::os_service_default,
-  $rabbit_use_ssl                       = $::os_service_default,
-  $rabbit_heartbeat_rate                = $::os_service_default,
-  $rabbit_heartbeat_in_pthread          = $::os_service_default,
-  $rabbit_ha_queues                     = $::os_service_default,
-  $rabbit_transient_queues_ttl          = $::os_service_default,
-  $rabbit_heartbeat_timeout_threshold   = $::os_service_default,
-  $kombu_ssl_ca_certs                   = $::os_service_default,
-  $kombu_ssl_certfile                   = $::os_service_default,
-  $kombu_ssl_keyfile                    = $::os_service_default,
-  $kombu_ssl_version                    = $::os_service_default,
-  $kombu_reconnect_delay                = $::os_service_default,
-  $kombu_missing_consumer_retry_timeout = $::os_service_default,
-  $kombu_failover_strategy              = $::os_service_default,
-  $kombu_compression                    = $::os_service_default,
-  $amqp_durable_queues                  = $::os_service_default,
-  $default_transport_url                = $::os_service_default,
-  $rpc_response_timeout                 = $::os_service_default,
-  $control_exchange                     = $::os_service_default,
+  $rabbit_login_method                  = $facts['os_service_default'],
+  $rabbit_retry_interval                = $facts['os_service_default'],
+  $rabbit_retry_backoff                 = $facts['os_service_default'],
+  $rabbit_interval_max                  = $facts['os_service_default'],
+  $rabbit_use_ssl                       = $facts['os_service_default'],
+  $rabbit_heartbeat_rate                = $facts['os_service_default'],
+  $rabbit_heartbeat_in_pthread          = $facts['os_service_default'],
+  $rabbit_ha_queues                     = $facts['os_service_default'],
+  $rabbit_transient_queues_ttl          = $facts['os_service_default'],
+  $rabbit_heartbeat_timeout_threshold   = $facts['os_service_default'],
+  $kombu_ssl_ca_certs                   = $facts['os_service_default'],
+  $kombu_ssl_certfile                   = $facts['os_service_default'],
+  $kombu_ssl_keyfile                    = $facts['os_service_default'],
+  $kombu_ssl_version                    = $facts['os_service_default'],
+  $kombu_reconnect_delay                = $facts['os_service_default'],
+  $kombu_missing_consumer_retry_timeout = $facts['os_service_default'],
+  $kombu_failover_strategy              = $facts['os_service_default'],
+  $kombu_compression                    = $facts['os_service_default'],
+  $amqp_durable_queues                  = $facts['os_service_default'],
+  $default_transport_url                = $facts['os_service_default'],
+  $rpc_response_timeout                 = $facts['os_service_default'],
+  $control_exchange                     = $facts['os_service_default'],
   # amqp
-  $amqp_username                        = $::os_service_default,
-  $amqp_password                        = $::os_service_default,
-  $amqp_ssl_ca_file                     = $::os_service_default,
-  $amqp_ssl_key_file                    = $::os_service_default,
-  $amqp_container_name                  = $::os_service_default,
-  $amqp_sasl_mechanisms                 = $::os_service_default,
-  $amqp_server_request_prefix           = $::os_service_default,
-  $amqp_ssl_key_password                = $::os_service_default,
-  $amqp_idle_timeout                    = $::os_service_default,
-  $amqp_ssl_cert_file                   = $::os_service_default,
-  $amqp_broadcast_prefix                = $::os_service_default,
-  $amqp_trace                           = $::os_service_default,
-  $amqp_sasl_config_name                = $::os_service_default,
-  $amqp_sasl_config_dir                 = $::os_service_default,
-  $amqp_group_request_prefix            = $::os_service_default,
+  $amqp_username                        = $facts['os_service_default'],
+  $amqp_password                        = $facts['os_service_default'],
+  $amqp_ssl_ca_file                     = $facts['os_service_default'],
+  $amqp_ssl_key_file                    = $facts['os_service_default'],
+  $amqp_container_name                  = $facts['os_service_default'],
+  $amqp_sasl_mechanisms                 = $facts['os_service_default'],
+  $amqp_server_request_prefix           = $facts['os_service_default'],
+  $amqp_ssl_key_password                = $facts['os_service_default'],
+  $amqp_idle_timeout                    = $facts['os_service_default'],
+  $amqp_ssl_cert_file                   = $facts['os_service_default'],
+  $amqp_broadcast_prefix                = $facts['os_service_default'],
+  $amqp_trace                           = $facts['os_service_default'],
+  $amqp_sasl_config_name                = $facts['os_service_default'],
+  $amqp_sasl_config_dir                 = $facts['os_service_default'],
+  $amqp_group_request_prefix            = $facts['os_service_default'],
   # messaging
-  $notification_transport_url           = $::os_service_default,
-  $notification_driver                  = $::os_service_default,
-  $notification_topics                  = $::os_service_default,
+  $notification_transport_url           = $facts['os_service_default'],
+  $notification_driver                  = $facts['os_service_default'],
+  $notification_topics                  = $facts['os_service_default'],
 ) {
 
   include openstacklib::openstackclient
diff --git a/manifests/ironic_client.pp b/manifests/ironic_client.pp
index 3d4cf82..97f6121 100644
--- a/manifests/ironic_client.pp
+++ b/manifests/ironic_client.pp
@@ -6,21 +6,21 @@
 #
 # [*api_version*]
 #  (Optional) Version of Ironic API to use in ironicclient.
-#  Defaults to $::os_service_default
+#  Defaults to $facts['os_service_default']
 #
 # [*endpoint_type*]
 #  (Optional) Type of endpoint to use in ironicclient.
-#  Defaults to $::os_service_default
+#  Defaults to $facts['os_service_default']
 #
 # [*region_name*]
 #  (Optional) Region in Identify service catalog to use for communication
 #  with the OpenStack service.
-#  Defaults to $::os_service_default.
+#  Defaults to $facts['os_service_default'].
 #
 class watcher::ironic_client (
-  $api_version   = $::os_service_default,
-  $endpoint_type = $::os_service_default,
-  $region_name   = $::os_service_default,
+  $api_version   = $facts['os_service_default'],
+  $endpoint_type = $facts['os_service_default'],
+  $region_name   = $facts['os_service_default'],
 ) {
 
   include watcher::deps
diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp
index 5a5d504..0a6fefb 100644
--- a/manifests/keystone/authtoken.pp
+++ b/manifests/keystone/authtoken.pp
@@ -6,7 +6,7 @@
 #
 # [*password*]
 #   (Optional) Password to create for the service user
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*username*]
 #   (Optional) The name of the service user
@@ -30,17 +30,17 @@
 #
 # [*system_scope*]
 #   (Optional) Scope for system operations
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*insecure*]
 #   (Optional) If true, explicitly allow TLS without checking server cert
 #   against any certificate authorities.  WARNING: not recommended.  Use with
 #   caution.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*auth_section*]
 #   (Optional) Config Section from which to load plugin specific options
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*auth_type*]
 #   (Optional) Authentication type to load
@@ -52,26 +52,26 @@
 #
 # [*auth_version*]
 #   (Optional) API version of the admin Identity API endpoint.
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*cache*]
 #   (Optional) Env key for the swift cache.
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*cafile*]
 #   (Optional) A PEM encoded Certificate Authority to use when verifying HTTPs
 #   connections.
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*certfile*]
 #   (Optional) Required if identity server requires client certificate
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*delay_auth_decision*]
 #   (Optional) Do not handle authorization requests within the middleware, but
 #   delegate the authorization decision to downstream WSGI components. Boolean
 #   value
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*enforce_token_bind*]
 #   (Optional) Used to control the use and type of token binding. Can be set
@@ -81,59 +81,59 @@
 #   type is unknown the token will be rejected. "required" any form of token
 #   binding is needed to be allowed. Finally the name of a binding method that
 #   must be present in tokens. String value.
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*http_connect_timeout*]
 #   (Optional) Request timeout value for communicating with Identity API
 #   server.
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*http_request_max_retries*]
 #   (Optional) How many times are we trying to reconnect when communicating
 #   with Identity API Server. Integer value
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*include_service_catalog*]
 #   (Optional) Indicate whether to set the X-Service-Catalog header. If False,
 #   middleware will not ask for service catalog on token validation and will
 #   not set the X-Service-Catalog header. Boolean value.
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*keyfile*]
 #   (Optional) Required if identity server requires client certificate
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*memcache_pool_conn_get_timeout*]
 #   (Optional) Number of seconds that an operation will wait to get a memcached
 #   client connection from the pool. Integer value
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*memcache_pool_dead_retry*]
 #   (Optional) Number of seconds memcached server is considered dead before it
 #   is tried again. Integer value
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*memcache_pool_maxsize*]
 #   (Optional) Maximum total number of open connections to every memcached
 #   server. Integer value
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*memcache_pool_socket_timeout*]
 #   (Optional) Number of seconds a connection to memcached is held unused in
 #   the
 #   pool before it is closed. Integer value
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*memcache_pool_unused_timeout*]
 #   (Optional) Number of seconds a connection to memcached is held unused in
 #   the
 #   pool before it is closed. Integer value
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*memcache_secret_key*]
 #   (Optional, mandatory if memcache_security_strategy is defined) This string
 #   is used for key derivation.
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*memcache_security_strategy*]
 #   (Optional) If defined, indicate whether token data should be authenticated
@@ -141,17 +141,17 @@
 #   HMAC) in the cache. If ENCRYPT, token data is encrypted and authenticated
 #   in the cache. If the value is not one of these options or empty,
 #   auth_token will raise an exception on initialization.
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*memcache_use_advanced_pool*]
 #   (Optional)  Use the advanced (eventlet safe) memcached client pool. The
 #   advanced pool will only work under python 2.x Boolean value
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*memcached_servers*]
 #   (Optional) Optionally specify a list of memcached server(s) to use for
 #   caching. If left undefined, tokens will instead be cached in-process.
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*manage_memcache_package*]
 #  (Optional) Whether to install the python-memcache package.
@@ -159,13 +159,13 @@
 #
 # [*region_name*]
 #   (Optional) The region in which the identity server can be found.
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*token_cache_time*]
 #   (Optional) In order to prevent excessive effort spent validating tokens,
 #   the middleware caches previously-seen tokens for a configurable duration
 #   (in seconds). Set to -1 to disable caching completely. Integer value
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*service_token_roles*]
 #   (Optional) A choice of roles that must be present in a service token.
@@ -175,62 +175,62 @@
 #   here are applied as an ANY check so any role in this list
 #   must be present. For backwards compatibility reasons this
 #   currently only affects the allow_expired check. (list value)
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*service_token_roles_required*]
 #   (optional) backwards compatibility to ensure that the service tokens are
 #   compared against a list of possible roles for validity
 #   true/false
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*service_type*]
 #  (Optional) The name or type of the service as it appears in the service
 #  catalog. This is used to validate tokens that have restricted access rules.
-#  Defaults to $::os_service_default.
+#  Defaults to $facts['os_service_default'].
 #
 # [*interface*]
 #  (Optional) Interface to use for the Identity API endpoint. Valid values are
 #  "public", "internal" or "admin".
-#  Defaults to $::os_service_default.
+#  Defaults to $facts['os_service_default'].
 #
 class watcher::keystone::authtoken (
-  $password                       = $::os_service_default,
+  $password                       = $facts['os_service_default'],
   $username                       = 'watcher',
   $auth_url                       = 'http://localhost:5000',
   $project_name                   = 'services',
   $user_domain_name               = 'Default',
   $project_domain_name            = 'Default',
-  $system_scope                   = $::os_service_default,
-  $insecure                       = $::os_service_default,
-  $auth_section                   = $::os_service_default,
+  $system_scope                   = $facts['os_service_default'],
+  $insecure                       = $facts['os_service_default'],
+  $auth_section                   = $facts['os_service_default'],
   $auth_type                      = 'password',
   $www_authenticate_uri           = 'http://localhost:5000',
-  $auth_version                   = $::os_service_default,
-  $cache                          = $::os_service_default,
-  $cafile                         = $::os_service_default,
-  $certfile                       = $::os_service_default,
-  $delay_auth_decision            = $::os_service_default,
-  $enforce_token_bind             = $::os_service_default,
-  $http_connect_timeout           = $::os_service_default,
-  $http_request_max_retries       = $::os_service_default,
-  $include_service_catalog        = $::os_service_default,
-  $keyfile                        = $::os_service_default,
-  $memcache_pool_conn_get_timeout = $::os_service_default,
-  $memcache_pool_dead_retry       = $::os_service_default,
-  $memcache_pool_maxsize          = $::os_service_default,
-  $memcache_pool_socket_timeout   = $::os_service_default,
-  $memcache_secret_key            = $::os_service_default,
-  $memcache_security_strategy     = $::os_service_default,
-  $memcache_use_advanced_pool     = $::os_service_default,
-  $memcache_pool_unused_timeout   = $::os_service_default,
-  $memcached_servers              = $::os_service_default,
+  $auth_version                   = $facts['os_service_default'],
+  $cache                          = $facts['os_service_default'],
+  $cafile                         = $facts['os_service_default'],
+  $certfile                       = $facts['os_service_default'],
+  $delay_auth_decision            = $facts['os_service_default'],
+  $enforce_token_bind             = $facts['os_service_default'],
+  $http_connect_timeout           = $facts['os_service_default'],
+  $http_request_max_retries       = $facts['os_service_default'],
+  $include_service_catalog        = $facts['os_service_default'],
+  $keyfile                        = $facts['os_service_default'],
+  $memcache_pool_conn_get_timeout = $facts['os_service_default'],
+  $memcache_pool_dead_retry       = $facts['os_service_default'],
+  $memcache_pool_maxsize          = $facts['os_service_default'],
+  $memcache_pool_socket_timeout   = $facts['os_service_default'],
+  $memcache_secret_key            = $facts['os_service_default'],
+  $memcache_security_strategy     = $facts['os_service_default'],
+  $memcache_use_advanced_pool     = $facts['os_service_default'],
+  $memcache_pool_unused_timeout   = $facts['os_service_default'],
+  $memcached_servers              = $facts['os_service_default'],
   $manage_memcache_package        = false,
-  $region_name                    = $::os_service_default,
-  $token_cache_time               = $::os_service_default,
-  $service_token_roles            = $::os_service_default,
-  $service_token_roles_required   = $::os_service_default,
-  $service_type                   = $::os_service_default,
-  $interface                      = $::os_service_default,
+  $region_name                    = $facts['os_service_default'],
+  $token_cache_time               = $facts['os_service_default'],
+  $service_token_roles            = $facts['os_service_default'],
+  $service_token_roles_required   = $facts['os_service_default'],
+  $service_type                   = $facts['os_service_default'],
+  $interface                      = $facts['os_service_default'],
 ) {
 
   include watcher::deps
diff --git a/manifests/keystone_client.pp b/manifests/keystone_client.pp
index c8b01ba..852de7d 100644
--- a/manifests/keystone_client.pp
+++ b/manifests/keystone_client.pp
@@ -6,16 +6,16 @@
 #
 # [*endpoint_type*]
 #  (Optional) Type of endpoint to use in keystoneclient.
-#  Defaults to $::os_service_default
+#  Defaults to $facts['os_service_default']
 #
 # [*region_name*]
 #  (Optional) Region in Identify service catalog to use for communication
 #  with the OpenStack service.
-#  Defaults to $::os_service_default.
+#  Defaults to $facts['os_service_default'].
 #
 class watcher::keystone_client (
-  $endpoint_type = $::os_service_default,
-  $region_name   = $::os_service_default,
+  $endpoint_type = $facts['os_service_default'],
+  $region_name   = $facts['os_service_default'],
 ) {
 
   include watcher::deps
diff --git a/manifests/logging.pp b/manifests/logging.pp
index 9d6c7f5..c924c17 100644
--- a/manifests/logging.pp
+++ b/manifests/logging.pp
@@ -6,31 +6,31 @@
 #
 # [*debug*]
 #   (Optional) Should the daemons log debug messages
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*use_syslog*]
 #   (Optional) Use syslog for logging.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*use_json*]
 #   (Optional) Use json for logging.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*use_journal*]
 #   (Optional) Use journal for logging.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*use_stderr*]
 #   (Optional) Use stderr for logging
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*syslog_log_facility*]
 #   (Optional) Syslog facility to receive log lines.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*log_dir*]
 #   (Optional) Directory where logs should be stored.
-#   If set to $::os_service_default, it will not log to any directory.
+#   If set to $facts['os_service_default'], it will not log to any directory.
 #   Defaults to '/var/log/watcher'.
 #
 # [*log_file*]
@@ -39,38 +39,38 @@
 #
 # [*watch_log_file*]
 #   (Optional) Uses logging handler designed to watch file system (boolean value).
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*logging_context_format_string*]
 #   (Optional) Format string to use for log messages with context.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #   Example: '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s\
 #             [%(request_id)s %(user_identity)s] %(instance)s%(message)s'
 #
 # [*logging_default_format_string*]
 #   (Optional) Format string to use for log messages without context.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #   Example: '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s\
 #             [-] %(instance)s%(message)s'
 #
 # [*logging_debug_format_suffix*]
 #   (Optional) Formatted data to append to log format when level is DEBUG.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #   Example: '%(funcName)s %(pathname)s:%(lineno)d'
 #
 # [*logging_exception_prefix*]
 #   (Optional) Prefix each line of exception output with this format.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #   Example: '%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s'
 #
 # [*log_config_append*]
 #   (Optional) The name of an additional logging configuration file.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #   See https://docs.python.org/2/howto/logging.html
 #
 # [*default_log_levels*]
 #   (0ptional) Hash of logger (keys) and level (values) pairs.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #   Example:
 #     { 'amqp'  => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN',
 #          'sqlalchemy' => 'WARN', 'suds' => 'INFO',
@@ -82,11 +82,11 @@
 #
 # [*publish_errors*]
 #   (Optional) Publish error events (boolean value).
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*fatal_deprecations*]
 #   (Optional) Make deprecations fatal (boolean value)
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*instance_format*]
 #   (Optional) If an instance is passed with the log message, format it
@@ -97,35 +97,35 @@
 # [*instance_uuid_format*]
 #   (Optional) If an instance UUID is passed with the log message, format
 #              it like this (string value).
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #   Example: instance_uuid_format='[instance: %(uuid)s] '
 #
 # [*log_date_format*]
 #   (Optional) Format string for %%(asctime)s in log records.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #   Example: 'Y-%m-%d %H:%M:%S'
 #
 class watcher::logging(
-  $use_syslog                    = $::os_service_default,
-  $use_json                      = $::os_service_default,
-  $use_journal                   = $::os_service_default,
-  $use_stderr                    = $::os_service_default,
-  $syslog_log_facility           = $::os_service_default,
+  $use_syslog                    = $facts['os_service_default'],
+  $use_json                      = $facts['os_service_default'],
+  $use_journal                   = $facts['os_service_default'],
+  $use_stderr                    = $facts['os_service_default'],
+  $syslog_log_facility           = $facts['os_service_default'],
   $log_dir                       = '/var/log/watcher',
   $log_file                      = '/var/log/watcher/watcher.log',
-  $watch_log_file                = $::os_service_default,
-  $debug                         = $::os_service_default,
-  $logging_context_format_string = $::os_service_default,
-  $logging_default_format_string = $::os_service_default,
-  $logging_debug_format_suffix   = $::os_service_default,
-  $logging_exception_prefix      = $::os_service_default,
-  $log_config_append             = $::os_service_default,
-  $default_log_levels            = $::os_service_default,
-  $publish_errors                = $::os_service_default,
-  $fatal_deprecations            = $::os_service_default,
-  $instance_format               = $::os_service_default,
-  $instance_uuid_format          = $::os_service_default,
-  $log_date_format               = $::os_service_default,
+  $watch_log_file                = $facts['os_service_default'],
+  $debug                         = $facts['os_service_default'],
+  $logging_context_format_string = $facts['os_service_default'],
+  $logging_default_format_string = $facts['os_service_default'],
+  $logging_debug_format_suffix   = $facts['os_service_default'],
+  $logging_exception_prefix      = $facts['os_service_default'],
+  $log_config_append             = $facts['os_service_default'],
+  $default_log_levels            = $facts['os_service_default'],
+  $publish_errors                = $facts['os_service_default'],
+  $fatal_deprecations            = $facts['os_service_default'],
+  $instance_format               = $facts['os_service_default'],
+  $instance_uuid_format          = $facts['os_service_default'],
+  $log_date_format               = $facts['os_service_default'],
 ) {
 
   include watcher::deps
diff --git a/manifests/neutron_client.pp b/manifests/neutron_client.pp
index a145551..531e914 100644
--- a/manifests/neutron_client.pp
+++ b/manifests/neutron_client.pp
@@ -6,21 +6,21 @@
 #
 # [*api_version*]
 #  (Optional) Version of Neutron API to use in neutronclient.
-#  Defaults to $::os_service_default
+#  Defaults to $facts['os_service_default']
 #
 # [*endpoint_type*]
 #  (Optional) Type of endpoint to use in neutronclient.
-#  Defaults to $::os_service_default
+#  Defaults to $facts['os_service_default']
 #
 # [*region_name*]
 #  (Optional) Region in Identify service catalog to use for communication
 #  with the OpenStack service.
-#  Defaults to $::os_service_default.
+#  Defaults to $facts['os_service_default'].
 #
 class watcher::neutron_client (
-  $api_version   = $::os_service_default,
-  $endpoint_type = $::os_service_default,
-  $region_name   = $::os_service_default,
+  $api_version   = $facts['os_service_default'],
+  $endpoint_type = $facts['os_service_default'],
+  $region_name   = $facts['os_service_default'],
 ) {
 
   include watcher::deps
diff --git a/manifests/nova_client.pp b/manifests/nova_client.pp
index c4dbbc6..48104cd 100644
--- a/manifests/nova_client.pp
+++ b/manifests/nova_client.pp
@@ -6,21 +6,21 @@
 #
 # [*api_version*]
 #  (Optional) Version of Nova API to use in novaclient.
-#  Defaults to $::os_service_default
+#  Defaults to $facts['os_service_default']
 #
 # [*endpoint_type*]
 #  (Optional) Type of endpoint to use in novaclient.
-#  Defaults to $::os_service_default
+#  Defaults to $facts['os_service_default']
 #
 # [*region_name*]
 #  (Optional) Region in Identify service catalog to use for communication
 #  with the OpenStack service.
-#  Defaults to $::os_service_default.
+#  Defaults to $facts['os_service_default'].
 #
 class watcher::nova_client (
-  $api_version   = $::os_service_default,
-  $endpoint_type = $::os_service_default,
-  $region_name   = $::os_service_default,
+  $api_version   = $facts['os_service_default'],
+  $endpoint_type = $facts['os_service_default'],
+  $region_name   = $facts['os_service_default'],
 ) {
 
   include watcher::deps
diff --git a/manifests/params.pp b/manifests/params.pp
index df9f378..2ce5d62 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -7,7 +7,7 @@ class watcher::params {
   $user                = 'watcher'
   $group               = 'watcher'
 
-  case $::osfamily {
+  case $facts['os']['family'] {
     'RedHat': {
       $api_service_name             = 'openstack-watcher-api'
       $api_package_name             = 'openstack-watcher-api'
@@ -31,8 +31,8 @@ class watcher::params {
       $watcher_wsgi_script_path     = '/usr/lib/cgi-bin/watcher'
     }
     default: {
-      fail("Unsupported osfamily: ${::osfamily} operatingsystem")
+      fail("Unsupported osfamily: ${facts['os']['family']}")
     }
 
-  } # Case $::osfamily
+  } # Case $facts['os']['family']
 }
diff --git a/manifests/placement_client.pp b/manifests/placement_client.pp
index 4223809..349bede 100644
--- a/manifests/placement_client.pp
+++ b/manifests/placement_client.pp
@@ -6,21 +6,21 @@
 #
 # [*api_version*]
 #  (Optional) Microversion of placement API when using placement service.
-#  Defaults to $::os_service_default
+#  Defaults to $facts['os_service_default']
 #
 # [*interface*]
 #  (Optional) Type of endpoint when using placement service.
-#  Defaults to $::os_service_default
+#  Defaults to $facts['os_service_default']
 #
 # [*region_name*]
 #  (Optional) Region in Identify service catalog to use for communication
 #  with the OpenStack service.
-#  Defaults to $::os_service_default.
+#  Defaults to $facts['os_service_default'].
 #
 class watcher::placement_client (
-  $api_version = $::os_service_default,
-  $interface   = $::os_service_default,
-  $region_name = $::os_service_default,
+  $api_version = $facts['os_service_default'],
+  $interface   = $facts['os_service_default'],
+  $region_name = $facts['os_service_default'],
 ) {
 
   include watcher::deps
diff --git a/manifests/policy.pp b/manifests/policy.pp
index 3175c9a..8cc56e8 100644
--- a/manifests/policy.pp
+++ b/manifests/policy.pp
@@ -6,12 +6,12 @@
 #
 # [*enforce_scope*]
 #  (Optional) Whether or not to enforce scope when evaluating policies.
-#  Defaults to $::os_service_default.
+#  Defaults to $facts['os_service_default'].
 #
 # [*enforce_new_defaults*]
 #  (Optional) Whether or not to use old deprecated defaults when evaluating
 #  policies.
-#  Defaults to $::os_service_default.
+#  Defaults to $facts['os_service_default'].
 #
 # [*policies*]
 #   (Optional) Set of policies to configure for watcher
@@ -34,11 +34,11 @@
 #
 # [*policy_default_rule*]
 #   (Optional) Default rule. Enforced when a requested rule is not found.
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*policy_dirs*]
 #   (Optional) Path to the watcher policy folder
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*purge_config*]
 #   (optional) Whether to set only the specified policy rules in the policy
@@ -46,12 +46,12 @@
 #    Defaults to false.
 #
 class watcher::policy (
-  $enforce_scope        = $::os_service_default,
-  $enforce_new_defaults = $::os_service_default,
+  $enforce_scope        = $facts['os_service_default'],
+  $enforce_new_defaults = $facts['os_service_default'],
   $policies             = {},
   $policy_path          = '/etc/watcher/policy.yaml',
-  $policy_default_rule  = $::os_service_default,
-  $policy_dirs          = $::os_service_default,
+  $policy_default_rule  = $facts['os_service_default'],
+  $policy_dirs          = $facts['os_service_default'],
   $purge_config         = false,
 ) {
 
diff --git a/manifests/watcher_clients_auth.pp b/manifests/watcher_clients_auth.pp
index e024553..3ee1ac7 100644
--- a/manifests/watcher_clients_auth.pp
+++ b/manifests/watcher_clients_auth.pp
@@ -29,7 +29,7 @@
 #
 # [*system_scope*]
 #   (Optional) Scope for system operations.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*auth_type*]
 #   (Optional) Authentication type to load.
@@ -37,20 +37,20 @@
 #
 # [*insecure*]
 #   (Optional) Verify HTTPS connections.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*keyfile*]
 #   (Optional) PEM encoded client certificate key file.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*certfile*]
 #   (Optional) PEM encoded client certificate cert file.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*cafile*]
 #   (Optional)PEM encoded Certificate Authority to use when verifying HTTPs
 #   connections.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 class watcher::watcher_clients_auth (
   $password,
@@ -59,12 +59,12 @@ class watcher::watcher_clients_auth (
   $project_name        = 'services',
   $project_domain_name = 'Default',
   $user_domain_name    = 'Default',
-  $system_scope        = $::os_service_default,
+  $system_scope        = $facts['os_service_default'],
   $auth_type           = 'password',
-  $insecure            = $::os_service_default,
-  $certfile            = $::os_service_default,
-  $cafile              = $::os_service_default,
-  $keyfile             = $::os_service_default,
+  $insecure            = $facts['os_service_default'],
+  $certfile            = $facts['os_service_default'],
+  $cafile              = $facts['os_service_default'],
+  $keyfile             = $facts['os_service_default'],
 ) {
 
   include watcher::deps
@@ -73,8 +73,8 @@ class watcher::watcher_clients_auth (
     $project_name_real = $project_name
     $project_domain_name_real = $project_domain_name
   } else {
-    $project_name_real = $::os_service_default
-    $project_domain_name_real = $::os_service_default
+    $project_name_real = $facts['os_service_default']
+    $project_domain_name_real = $facts['os_service_default']
   }
 
   watcher_config {
diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp
index 22cb3f1..851fbbc 100644
--- a/manifests/wsgi/apache.pp
+++ b/manifests/wsgi/apache.pp
@@ -22,7 +22,7 @@
 #
 #   [*servername*]
 #     The servername for the virtualhost.
-#     Optional. Defaults to $::fqdn
+#     Optional. Defaults to $facts['networking']['fqdn']
 #
 #   [*port*]
 #     The port.
@@ -42,7 +42,7 @@
 #
 #   [*workers*]
 #     Number of WSGI workers to spawn.
-#     Optional. Defaults to $::os_workers
+#     Optional. Defaults to $facts['os_workers']
 #
 #   [*priority*]
 #     (optional) The priority for the vhost.
@@ -121,12 +121,12 @@
 #   class { 'watcher::wsgi::apache': }
 #
 class watcher::wsgi::apache (
-  $servername                  = $::fqdn,
+  $servername                  = $facts['networking']['fqdn'],
   $port                        = 9322,
   $bind_host                   = undef,
   $path                        = '/',
   $ssl                         = false,
-  $workers                     = $::os_workers,
+  $workers                     = $facts['os_workers'],
   $ssl_cert                    = undef,
   $ssl_key                     = undef,
   $ssl_chain                   = undef,
diff --git a/spec/classes/watcher_api_spec.rb b/spec/classes/watcher_api_spec.rb
index e340d5e..59554f1 100644
--- a/spec/classes/watcher_api_spec.rb
+++ b/spec/classes/watcher_api_spec.rb
@@ -126,7 +126,7 @@ describe 'watcher::api' do
         facts.merge!(OSDefaults.get_facts())
       end
       let(:platform_params) do
-        case facts[:osfamily]
+        case facts[:os]['family']
         when 'Debian'
           { :api_package_name => 'watcher-api',
             :api_service_name => 'watcher-api' }
diff --git a/spec/classes/watcher_applier_spec.rb b/spec/classes/watcher_applier_spec.rb
index 57a7354..c794960 100644
--- a/spec/classes/watcher_applier_spec.rb
+++ b/spec/classes/watcher_applier_spec.rb
@@ -86,7 +86,7 @@ describe 'watcher::applier' do
         facts.merge!(OSDefaults.get_facts())
       end
       let(:platform_params) do
-        case facts[:osfamily]
+        case facts[:os]['family']
         when 'Debian'
           { :watcher_applier_package => 'watcher-applier',
             :applier_service_name    => 'watcher-applier',
diff --git a/spec/classes/watcher_client_spec.rb b/spec/classes/watcher_client_spec.rb
index fb06ddb..7a69e53 100644
--- a/spec/classes/watcher_client_spec.rb
+++ b/spec/classes/watcher_client_spec.rb
@@ -25,7 +25,7 @@ describe 'watcher::client' do
       end
 
       let(:platform_params) do
-        case facts[:osfamily]
+        case facts[:os]['family']
         when 'Debian'
           { :client_package_name => 'python3-watcherclient' }
         when 'RedHat'
diff --git a/spec/classes/watcher_decision_engine_spec.rb b/spec/classes/watcher_decision_engine_spec.rb
index 6c018b7..7e6903a 100644
--- a/spec/classes/watcher_decision_engine_spec.rb
+++ b/spec/classes/watcher_decision_engine_spec.rb
@@ -94,7 +94,7 @@ describe 'watcher::decision_engine' do
         facts.merge!(OSDefaults.get_facts())
       end
       let(:platform_params) do
-        case facts[:osfamily]
+        case facts[:os]['family']
         when 'Debian'
           { :watcher_decision_engine_package => 'watcher-decision-engine',
             :decision_engine_service_name    => 'watcher-decision-engine',
diff --git a/spec/classes/watcher_init_spec.rb b/spec/classes/watcher_init_spec.rb
index b957d7d..831114c 100644
--- a/spec/classes/watcher_init_spec.rb
+++ b/spec/classes/watcher_init_spec.rb
@@ -227,7 +227,7 @@ describe 'watcher' do
         facts.merge!(OSDefaults.get_facts())
       end
       let(:platform_params) do
-        case facts[:osfamily]
+        case facts[:os]['family']
         when 'Debian'
           { :watcher_common_package => 'watcher-common' }
         when 'RedHat'
diff --git a/spec/classes/watcher_wsgi_apache_spec.rb b/spec/classes/watcher_wsgi_apache_spec.rb
index 8b8f49f..e35b09b 100644
--- a/spec/classes/watcher_wsgi_apache_spec.rb
+++ b/spec/classes/watcher_wsgi_apache_spec.rb
@@ -10,7 +10,7 @@ describe 'watcher::wsgi::apache' do
         :group                       => 'watcher',
         :path                        => '/',
         :priority                    => 10,
-        :servername                  => facts[:fqdn],
+        :servername                  => 'foo.example.com',
         :ssl                         => false,
         :threads                     => 1,
         :user                        => 'watcher',
@@ -145,14 +145,12 @@ describe 'watcher::wsgi::apache' do
     context "on #{os}" do
       let (:facts) do
         facts.merge!(OSDefaults.get_facts({
-          :os_workers     => 42,
-          :concat_basedir => '/var/lib/puppet/concat',
-          :fqdn           => 'some.host.tld',
+          :os_workers => 42,
         }))
       end
 
       let(:platform_params) do
-        case facts[:osfamily]
+        case facts[:os]['family']
         when 'Debian'
           {
             :wsgi_script_path   => '/usr/lib/cgi-bin/watcher',