diff --git a/manifests/api.pp b/manifests/api.pp
index 99f29c49..d1f2dc47 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -34,15 +34,15 @@
 # [*enable_proxy_headers_parsing*]
 #   (Optional) Enable paste middleware to handle SSL requests through
 #   HTTPProxyToWSGI middleware.
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*max_request_body_size*]
 #   (Optional) Set max request body size
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*paste_config*]
 #   (Optional) Configuration file for WSGI definition of API
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*gnocchi_external_project_owner*]
 #   (optional) Gnocchi external project owner (usually Ceilometer project name)
@@ -59,9 +59,9 @@ class aodh::api (
   $service_name                   = $::aodh::params::api_service_name,
   $sync_db                        = false,
   $auth_strategy                  = 'keystone',
-  $enable_proxy_headers_parsing   = $::os_service_default,
-  $max_request_body_size          = $::os_service_default,
-  $paste_config                   = $::os_service_default,
+  $enable_proxy_headers_parsing   = $facts['os_service_default'],
+  $max_request_body_size          = $facts['os_service_default'],
+  $paste_config                   = $facts['os_service_default'],
   $gnocchi_external_project_owner = 'services',
   $gnocchi_external_domain_name   = 'Default',
 ) inherits aodh::params {
diff --git a/manifests/coordination.pp b/manifests/coordination.pp
index 629249be..ceb1f930 100644
--- a/manifests/coordination.pp
+++ b/manifests/coordination.pp
@@ -6,28 +6,28 @@
 #
 # [*backend_url*]
 #   (Optional) Coordination backend URL.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*heartbeat_interval*]
 #   (Optional) Number of seconds between heartbeats for distributed
 #   coordination.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*retry_backoff*]
 #   (Optional) Retry backoff factor when retrying to connect with coordination
 #   backend.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*max_retry_interval*]
 #   (Optional) Maximum number of seconds between retry to join partitioning
 #   group
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 class aodh::coordination (
-  $backend_url        = $::os_service_default,
-  $heartbeat_interval = $::os_service_default,
-  $retry_backoff      = $::os_service_default,
-  $max_retry_interval = $::os_service_default,
+  $backend_url        = $facts['os_service_default'],
+  $heartbeat_interval = $facts['os_service_default'],
+  $retry_backoff      = $facts['os_service_default'],
+  $max_retry_interval = $facts['os_service_default'],
 ) {
 
   include aodh::deps
diff --git a/manifests/cors.pp b/manifests/cors.pp
index 0771d962..6b1efb28 100644
--- a/manifests/cors.pp
+++ b/manifests/cors.pp
@@ -8,41 +8,41 @@
 #   (Optional) Indicate whether this resource may be shared with the domain
 #   received in the requests "origin" header.
 #   (string value)
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*allow_credentials*]
 #   (Optional) Indicate that the actual request can include user credentials.
 #   (boolean value)
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*expose_headers*]
 #   (Optional) Indicate which headers are safe to expose to the API.
 #   (list value)
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*max_age*]
 #   (Optional) Maximum cache age of CORS preflight requests.
 #   (integer value)
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*allow_methods*]
 #   (Optional) Indicate which methods can be used during the actual request.
 #   (list value)
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*allow_headers*]
 #   (Optional) Indicate which header field names may be used during the actual
 #   request.
 #   (list value)
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 class aodh::cors (
-  $allowed_origin    = $::os_service_default,
-  $allow_credentials = $::os_service_default,
-  $expose_headers    = $::os_service_default,
-  $max_age           = $::os_service_default,
-  $allow_methods     = $::os_service_default,
-  $allow_headers     = $::os_service_default,
+  $allowed_origin    = $facts['os_service_default'],
+  $allow_credentials = $facts['os_service_default'],
+  $expose_headers    = $facts['os_service_default'],
+  $max_age           = $facts['os_service_default'],
+  $allow_methods     = $facts['os_service_default'],
+  $allow_headers     = $facts['os_service_default'],
 ) {
 
   include aodh::deps
diff --git a/manifests/db.pp b/manifests/db.pp
index 8abaf6bf..0753b142 100644
--- a/manifests/db.pp
+++ b/manifests/db.pp
@@ -7,7 +7,7 @@
 # [*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_connection*]
 #   Url used to connect to database.
@@ -15,49 +15,49 @@
 #
 # [*slave_connection*]
 #   (optional) Connection url to connect to aodh slave database (read-only).
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*database_connection_recycle_time*]
 #   Timeout when db connections should be reaped.
-#   (Optional) Defaults to $::os_service_default.
+#   (Optional) Defaults to $facts['os_service_default'].
 #
 # [*database_max_pool_size*]
 #   Maximum number of SQL connections to keep open in a pool.
-#   (Optional) Defaults to $::os_service_default.
+#   (Optional) Defaults to $facts['os_service_default'].
 #
 # [*database_max_retries*]
 #   Maximum number of database connection retries during startup.
 #   Setting -1 implies an infinite retry count.
-#   (Optional) Defaults to $::os_service_default.
+#   (Optional) Defaults to $facts['os_service_default'].
 #
 # [*database_retry_interval*]
 #   Interval between retries of opening a database connection.
-#   (Optional) Defaults to $::os_service_default.
+#   (Optional) Defaults to $facts['os_service_default'].
 #
 # [*database_max_overflow*]
 #   If set, use this value for max_overflow with sqlalchemy.
-#   (Optional) Defaults to $::os_service_default.
+#   (Optional) 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 aodh::db (
-  $database_db_max_retries          = $::os_service_default,
+  $database_db_max_retries          = $facts['os_service_default'],
   $database_connection              = 'sqlite:////var/lib/aodh/aodh.sqlite',
-  $slave_connection                 = $::os_service_default,
-  $database_connection_recycle_time = $::os_service_default,
-  $database_max_pool_size           = $::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,
+  $slave_connection                 = $facts['os_service_default'],
+  $database_connection_recycle_time = $facts['os_service_default'],
+  $database_max_pool_size           = $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 aodh::deps
diff --git a/manifests/evaluator.pp b/manifests/evaluator.pp
index d50df343..bb8c26a8 100644
--- a/manifests/evaluator.pp
+++ b/manifests/evaluator.pp
@@ -15,29 +15,29 @@
 #
 #  [*workers*]
 #    (optional) Number of workers for evaluator service.
-#    Defaults to $::os_workers.
+#    Defaults to $facts['os_workers'].
 #
 #  [*evaluation_interval*]
 #    (optional) Period of evaluation cycle
-#    Defaults to $::os_service_default.
+#    Defaults to $facts['os_service_default'].
 #
 #  [*event_alarm_cache_ttl*]
 #    (optional) TTL of event alarm caches, in seconds.
-#    Defaults to $::os_service_default.
+#    Defaults to $facts['os_service_default'].
 #
 #  [*additional_ingestion_lag*]
 #    (optional) The number of seconds to extend the evaluation windows to
 #    compensate the reporting/ingestion lag.
-#    Defaults to $::os_service_default.
+#    Defaults to $facts['os_service_default'].
 #
 class aodh::evaluator (
   $manage_service           = true,
   $enabled                  = true,
   $package_ensure           = 'present',
-  $workers                  = $::os_workers,
-  $evaluation_interval      = $::os_service_default,
-  $event_alarm_cache_ttl    = $::os_service_default,
-  $additional_ingestion_lag = $::os_service_default,
+  $workers                  = $facts['os_workers'],
+  $evaluation_interval      = $facts['os_service_default'],
+  $event_alarm_cache_ttl    = $facts['os_service_default'],
+  $additional_ingestion_lag = $facts['os_service_default'],
 ) {
 
   include aodh::deps
diff --git a/manifests/expirer.pp b/manifests/expirer.pp
index 80f04fd3..89650c2f 100644
--- a/manifests/expirer.pp
+++ b/manifests/expirer.pp
@@ -36,7 +36,7 @@
 #
 #  [*alarm_histories_delete_batch_size*]
 #    (optional) Limit number of deleted alarm histories in single purge run
-#    Defaults to $::os_service_default.
+#    Defaults to $facts['os_service_default'].
 #
 class aodh::expirer (
   $ensure                            = 'present',
@@ -47,7 +47,7 @@ class aodh::expirer (
   $month                             = '*',
   $weekday                           = '*',
   $maxdelay                          = 0,
-  $alarm_histories_delete_batch_size = $::os_service_default,
+  $alarm_histories_delete_batch_size = $facts['os_service_default'],
 ) {
 
   include aodh::params
diff --git a/manifests/healthcheck.pp b/manifests/healthcheck.pp
index c15f9ef1..5b30b5eb 100644
--- a/manifests/healthcheck.pp
+++ b/manifests/healthcheck.pp
@@ -6,28 +6,28 @@
 #
 # [*detailed*]
 #   (Optional) Show more detailed information as part of the response.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*backends*]
 #   (Optional) Additional backends that can perform health checks and report
 #   that information back as part of a request.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*disable_by_file_path*]
 #   (Optional) Check the presence of a file to determine if an application
 #   is running on a port.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*disable_by_file_paths*]
 #   (Optional) Check the presence of a file to determine if an application
 #   is running on a port. Expects a "port:path" list of strings.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 class aodh::healthcheck (
-  $detailed              = $::os_service_default,
-  $backends              = $::os_service_default,
-  $disable_by_file_path  = $::os_service_default,
-  $disable_by_file_paths = $::os_service_default,
+  $detailed              = $facts['os_service_default'],
+  $backends              = $facts['os_service_default'],
+  $disable_by_file_path  = $facts['os_service_default'],
+  $disable_by_file_paths = $facts['os_service_default'],
 ) {
 
   include aodh::deps
diff --git a/manifests/init.pp b/manifests/init.pp
index a7fd76de..e0c65293 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -11,35 +11,35 @@
 # [*alarm_history_time_to_live*]
 #   (Optional) Number of seconds that alarm histories are kept in the database for
 #   (<= 0 means forever)
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*executor_thread_pool_size*]
 #   (optional) Size of executor thread pool when executor is threading or eventlet.
-#   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. 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']
 #
 # [*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']
 #
 # [*rabbit_use_ssl*]
 #   (optional) Connect over SSL for RabbitMQ
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*rabbit_ha_queues*]
 #   (optional) Use HA queues in RabbitMQ.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*rabbit_heartbeat_timeout_threshold*]
 #   (optional) Number of seconds after which the RabbitMQ broker is considered
@@ -47,14 +47,14 @@
 #   Heartbeating helps to ensure the TCP connection to RabbitMQ isn't silently
 #   closed, resulting in missed or lost messages from the queue.
 #   (Requires kombu >= 3.0.7 and amqp >= 1.4.0)
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*rabbit_heartbeat_rate*]
 #   (optional) How often during the rabbit_heartbeat_timeout_threshold period to
 #   check the heartbeat on RabbitMQ connection.  (i.e. rabbit_heartbeat_rate=2
 #   when rabbit_heartbeat_timeout_threshold=60, the heartbeat will be checked
 #   every 30 seconds.
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*rabbit_heartbeat_in_pthread*]
 #   (Optional) EXPERIMENTAL: Run the health check heartbeat thread
@@ -64,121 +64,121 @@
 #   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']
 #
 # [*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, SSLv23 and SSLv3. SSLv2 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_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 not be available in future versions. EXPERIMENTAL.
 #   (string value)
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*amqp_durable_queues*]
 #   (optional) Define queues as "durable" to rabbitmq.
-#   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_broadcast_prefix*]
 #   (Optional) address prefix used when broadcasting to all servers
-#   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'].
 #
 # [*amqp_container_name*]
 #   (Optional) Name for the AMQP container
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*amqp_idle_timeout*]
 #   (Optional) Timeout for inactive connections
-#   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_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_cert_file*]
 #   (Optional) Identifying certificate PEM file to present to clients
-#   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_ssl_key_password*]
 #   (Optional) Password for decrypting ssl_key_file (if encrypted)
-#   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_sasl_config_dir*]
 #   (Optional) Path to directory that contains the SASL configuration
-#   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_username*]
 #   (Optional) User name for message broker authentication
-#   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'].
 #
 # [*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
@@ -187,42 +187,42 @@
 #
 class aodh (
   $package_ensure                     = 'present',
-  $alarm_history_time_to_live         = $::os_service_default,
-  $executor_thread_pool_size          = $::os_service_default,
-  $default_transport_url              = $::os_service_default,
-  $rpc_response_timeout               = $::os_service_default,
-  $control_exchange                   = $::os_service_default,
-  $rabbit_use_ssl                     = $::os_service_default,
-  $rabbit_heartbeat_timeout_threshold = $::os_service_default,
-  $rabbit_heartbeat_rate              = $::os_service_default,
-  $rabbit_heartbeat_in_pthread        = $::os_service_default,
-  $rabbit_ha_queues                   = $::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_failover_strategy            = $::os_service_default,
-  $kombu_compression                  = $::os_service_default,
-  $amqp_durable_queues                = $::os_service_default,
-  $amqp_server_request_prefix         = $::os_service_default,
-  $amqp_broadcast_prefix              = $::os_service_default,
-  $amqp_group_request_prefix          = $::os_service_default,
-  $amqp_container_name                = $::os_service_default,
-  $amqp_idle_timeout                  = $::os_service_default,
-  $amqp_trace                         = $::os_service_default,
-  $amqp_ssl_ca_file                   = $::os_service_default,
-  $amqp_ssl_cert_file                 = $::os_service_default,
-  $amqp_ssl_key_file                  = $::os_service_default,
-  $amqp_ssl_key_password              = $::os_service_default,
-  $amqp_sasl_mechanisms               = $::os_service_default,
-  $amqp_sasl_config_dir               = $::os_service_default,
-  $amqp_sasl_config_name              = $::os_service_default,
-  $amqp_username                      = $::os_service_default,
-  $amqp_password                      = $::os_service_default,
-  $notification_transport_url         = $::os_service_default,
-  $notification_driver                = $::os_service_default,
-  $notification_topics                = $::os_service_default,
+  $alarm_history_time_to_live         = $facts['os_service_default'],
+  $executor_thread_pool_size          = $facts['os_service_default'],
+  $default_transport_url              = $facts['os_service_default'],
+  $rpc_response_timeout               = $facts['os_service_default'],
+  $control_exchange                   = $facts['os_service_default'],
+  $rabbit_use_ssl                     = $facts['os_service_default'],
+  $rabbit_heartbeat_timeout_threshold = $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'],
+  $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_failover_strategy            = $facts['os_service_default'],
+  $kombu_compression                  = $facts['os_service_default'],
+  $amqp_durable_queues                = $facts['os_service_default'],
+  $amqp_server_request_prefix         = $facts['os_service_default'],
+  $amqp_broadcast_prefix              = $facts['os_service_default'],
+  $amqp_group_request_prefix          = $facts['os_service_default'],
+  $amqp_container_name                = $facts['os_service_default'],
+  $amqp_idle_timeout                  = $facts['os_service_default'],
+  $amqp_trace                         = $facts['os_service_default'],
+  $amqp_ssl_ca_file                   = $facts['os_service_default'],
+  $amqp_ssl_cert_file                 = $facts['os_service_default'],
+  $amqp_ssl_key_file                  = $facts['os_service_default'],
+  $amqp_ssl_key_password              = $facts['os_service_default'],
+  $amqp_sasl_mechanisms               = $facts['os_service_default'],
+  $amqp_sasl_config_dir               = $facts['os_service_default'],
+  $amqp_sasl_config_name              = $facts['os_service_default'],
+  $amqp_username                      = $facts['os_service_default'],
+  $amqp_password                      = $facts['os_service_default'],
+  $notification_transport_url         = $facts['os_service_default'],
+  $notification_driver                = $facts['os_service_default'],
+  $notification_topics                = $facts['os_service_default'],
   $purge_config                       = false,
 ) inherits aodh::params {
 
diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp
index 73dc2d9c..fd64bf9d 100644
--- a/manifests/keystone/authtoken.pp
+++ b/manifests/keystone/authtoken.pp
@@ -10,7 +10,7 @@
 #
 # [*password*]
 #   (Optional) Password to create for the service user
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #
 # [*auth_url*]
 #   (Optional) The URL to use for authentication.
@@ -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,57 +81,57 @@
 #   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
@@ -139,17 +139,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.
@@ -157,13 +157,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.
@@ -173,23 +173,23 @@
 #   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'].
 #
 # [*params*]
 #  (Optional) Hash of additional parameters to pass through to the keystone
@@ -197,42 +197,42 @@
 #
 class aodh::keystone::authtoken(
   $username                       = 'aodh',
-  $password                       = $::os_service_default,
+  $password                       = $facts['os_service_default'],
   $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_pool_unused_timeout   = $::os_service_default,
-  $memcache_secret_key            = $::os_service_default,
-  $memcache_security_strategy     = $::os_service_default,
-  $memcache_use_advanced_pool     = $::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_pool_unused_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'],
+  $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'],
   $params                         = {},
 ) {
 
diff --git a/manifests/listener.pp b/manifests/listener.pp
index 1098b489..219dbfbe 100644
--- a/manifests/listener.pp
+++ b/manifests/listener.pp
@@ -15,29 +15,29 @@
 #
 # [*workers*]
 #   (optional) Number of workers for evaluator service.
-#   Defaults to $::os_workers.
+#   Defaults to $facts['os_workers'].
 #
 # [*event_alarm_topic*]
 #   (optional) The topic that aodh uses for event alarm evaluation.
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*batch_size*]
 #   (optional) Number of notification messages to wait before dispatching them.
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 # [*batch_timeout*]
 #   (optional) Number of seconds to wait before dispatching samples when
 #   batch_size is not reached.
-#   Defaults to $::os_service_default.
+#   Defaults to $facts['os_service_default'].
 #
 class aodh::listener (
   $manage_service    = true,
   $enabled           = true,
   $package_ensure    = 'present',
-  $workers           = $::os_workers,
-  $event_alarm_topic = $::os_service_default,
-  $batch_size        = $::os_service_default,
-  $batch_timeout     = $::os_service_default,
+  $workers           = $facts['os_workers'],
+  $event_alarm_topic = $facts['os_service_default'],
+  $batch_size        = $facts['os_service_default'],
+  $batch_timeout     = $facts['os_service_default'],
 ) {
 
   include aodh::deps
diff --git a/manifests/logging.pp b/manifests/logging.pp
index 34a1b494..6b71656a 100644
--- a/manifests/logging.pp
+++ b/manifests/logging.pp
@@ -6,72 +6,72 @@
 #
 # [*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']
 #
 # [*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 boolean false or the $::os_service_default, it will not log to
+#   If set to boolean false or the $facts['os_service_default'], it will not log to
 #   any directory.
 #   Defaults to '/var/log/aodh'.
 #
 # [*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']
 #
 # [*log_file*]
 #   (Optional) File where logs should be stored.
-#   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*]
 #   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*]
 #   (Optional) 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', 'iso8601' => 'WARN',
@@ -79,50 +79,50 @@
 #
 # [*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
 #              like this (string value).
-#   Defaults to $::os_service_default
+#   Defaults to $facts['os_service_default']
 #   Example: '[instance: %(uuid)s] '
 #
 #  [*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 aodh::logging(
-  $use_syslog                    = $::os_service_default,
-  $use_json                      = $::os_service_default,
-  $use_journal                   = $::os_service_default,
-  $use_stderr                    = $::os_service_default,
-  $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'],
+  $log_facility                  = $facts['os_service_default'],
   $log_dir                       = '/var/log/aodh',
-  $watch_log_file                = $::os_service_default,
-  $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'],
+  $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 aodh::deps
diff --git a/manifests/notifier.pp b/manifests/notifier.pp
index 9dc9bc51..2a9a4033 100644
--- a/manifests/notifier.pp
+++ b/manifests/notifier.pp
@@ -15,25 +15,25 @@
 #
 #  [*workers*]
 #    (optional) Number of workers for notifier service.
-#    Defaults to $::os_workers.
+#    Defaults to $facts['os_workers'].
 #
 #  [*batch_size*]
 #    (optional) Number of notification messages to wait before dispatching
 #    them.
-#    Defaults to $::os_service_default.
+#    Defaults to $facts['os_service_default'].
 #
 #  [*batch_timeout*]
 #    (optional) Number of seconds to wait before dispatching samples when
 #    batch_size is not reached.
-#    Defaults to $::os_service_default
+#    Defaults to $facts['os_service_default']
 #
 class aodh::notifier (
   $manage_service = true,
   $enabled        = true,
   $package_ensure = 'present',
-  $workers        = $::os_workers,
-  $batch_size     = $::os_service_default,
-  $batch_timeout  = $::os_service_default,
+  $workers        = $facts['os_workers'],
+  $batch_size     = $facts['os_service_default'],
+  $batch_timeout  = $facts['os_service_default'],
 ) {
 
   include aodh::deps
diff --git a/manifests/params.pp b/manifests/params.pp
index 4edf393b..1fd9251e 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -8,7 +8,7 @@ class aodh::params {
   $group               = 'aodh'
   $expirer_command     = 'aodh-expirer'
 
-  case $::osfamily {
+  case $facts['os']['family'] {
     'RedHat': {
       $common_package_name     = 'openstack-aodh-common'
       $api_package_name        = 'openstack-aodh-api'
@@ -27,7 +27,7 @@ class aodh::params {
     'Debian': {
       $common_package_name     = 'aodh-common'
       $api_package_name        = 'aodh-api'
-      case $::operatingsystem {
+      case $facts['os']['name'] {
         'Ubuntu': {
           $api_service_name = 'httpd'
         }
@@ -47,9 +47,8 @@ class aodh::params {
       $aodh_wsgi_script_source = '/usr/bin/aodh-api'
     }
     default: {
-      fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, \
-module ${module_name} only support osfamily RedHat and Debian")
+      fail("Unsupported osfamily: ${facts['os']['family']}")
     }
 
-  } # Case $::osfamily
+  }
 }
diff --git a/manifests/policy.pp b/manifests/policy.pp
index f786770a..e42e96e2 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 aodh
@@ -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 aodh 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 aodh::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/aodh/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/quota.pp b/manifests/quota.pp
index 2074b739..1affb04c 100644
--- a/manifests/quota.pp
+++ b/manifests/quota.pp
@@ -4,20 +4,20 @@
 #
 #  [*user_alarm_quota*]
 #    (optional) Maximum number of alarms defined for a user.
-#    Defaults to $:os_service_default.
+#    Defaults to $facts['os_service_default'].
 #
 #  [*project_alarm_quota*]
 #    (optional) Maximum number of alarms defined for a project.
-#    Defaults to $:os_service_default.
+#    Defaults to $facts['os_service_default'].
 #
 #  [*alarm_max_actions*]
 #    (optional) Maximum count of actions for each state of an alarm.
-#    Defaults to $:os_service_default.
+#    Defaults to $facts['os_service_default'].
 #
 class aodh::quota (
-  $user_alarm_quota    = $::os_service_default,
-  $project_alarm_quota = $::os_service_default,
-  $alarm_max_actions   = $::os_service_default,
+  $user_alarm_quota    = $facts['os_service_default'],
+  $project_alarm_quota = $facts['os_service_default'],
+  $alarm_max_actions   = $facts['os_service_default'],
 ) {
 
   include aodh::deps
diff --git a/manifests/service_credentials.pp b/manifests/service_credentials.pp
index f6ef4e90..5126da9e 100644
--- a/manifests/service_credentials.pp
+++ b/manifests/service_credentials.pp
@@ -32,7 +32,7 @@
 #
 # [*system_scope*]
 #  (Optional) Scope for system operations.
-#  Defaults to $::os_service_default
+#  Defaults to $facts['os_service_default']
 #
 # [*auth_type*]
 #  (Optional) An authentication type to use with an OpenStack Identity server.
@@ -41,12 +41,12 @@
 #
 # [*cacert*]
 #  (Optional) Certificate chain for SSL validation.
-#  Defaults to $::os_service_default
+#  Defaults to $facts['os_service_default']
 #
 # [*interface*]
 #  (Optional) Type of endpoint in Identity service catalog to use for
 #  communication with OpenStack services.
-#  Optional. Defaults to $::os_service_default.
+#  Optional. Defaults to $facts['os_service_default'].
 #
 class aodh::service_credentials (
   $password,
@@ -56,10 +56,10 @@ class aodh::service_credentials (
   $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',
-  $cacert              = $::os_service_default,
-  $interface           = $::os_service_default,
+  $cacert              = $facts['os_service_default'],
+  $interface           = $facts['os_service_default'],
 ) {
 
   include aodh::deps
@@ -68,8 +68,8 @@ class aodh::service_credentials (
     $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']
   }
 
   aodh_config {
diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp
index 331da0b1..e4717d92 100644
--- a/manifests/wsgi/apache.pp
+++ b/manifests/wsgi/apache.pp
@@ -26,7 +26,7 @@
 #
 # [*servername*]
 #   (Optional) The servername for the virtualhost.
-#   Defaults to $::fqdn
+#   Defaults to $facts['networking']['fqdn']
 #
 # [*port*]
 #   (Optional) The port.
@@ -46,7 +46,7 @@
 #
 # [*workers*]
 #   (Optional) Number of WSGI workers to spawn.
-#   Defaults to $::os_workers
+#   Defaults to $facts['os_workers']
 #
 # [*priority*]
 #   (Optional) The priority for the vhost.
@@ -140,12 +140,12 @@
 #   class { 'aodh::wsgi::apache': }
 #
 class aodh::wsgi::apache (
-  $servername                  = $::fqdn,
+  $servername                  = $facts['networking']['fqdn'],
   $port                        = 8042,
   $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/manifests/wsgi/uwsgi.pp b/manifests/wsgi/uwsgi.pp
index 1ecb9c83..400ab99b 100644
--- a/manifests/wsgi/uwsgi.pp
+++ b/manifests/wsgi/uwsgi.pp
@@ -11,7 +11,7 @@
 #
 # [*processes*]
 #   (Optional) Number of processes.
-#   Defaults to $::os_workers.
+#   Defaults to $facts['os_workers'].
 #
 # [*threads*]
 #   (Optional) Number of threads.
@@ -22,14 +22,14 @@
 #   Defaults to 100
 #
 class aodh::wsgi::uwsgi (
-  $processes         = $::os_workers,
+  $processes         = $facts['os_workers'],
   $threads           = 32,
   $listen_queue_size = 100,
 ){
 
   include aodh::deps
 
-  if $::operatingsystem != 'Debian' {
+  if $facts['os']['name'] != 'Debian' {
     warning('This class is only valid for Debian, as other operating systems are not using uwsgi by default.')
   }
 
diff --git a/spec/classes/aodh_api_spec.rb b/spec/classes/aodh_api_spec.rb
index 5d0cd9f0..346cafb8 100644
--- a/spec/classes/aodh_api_spec.rb
+++ b/spec/classes/aodh_api_spec.rb
@@ -191,16 +191,13 @@ describe 'aodh::api' do
   }).each do |os,facts|
     context "on #{os}" do
       let (:facts) do
-        facts.merge!(OSDefaults.get_facts({
-          :fqdn           => 'some.host.tld',
-          :concat_basedir => '/var/lib/puppet/concat'
-        }))
+        facts.merge!(OSDefaults.get_facts())
       end
 
       let(:platform_params) do
-        case facts[:osfamily]
+        case facts[:os]['family']
         when 'Debian'
-          if facts[:operatingsystem] == 'Ubuntu'
+          if facts[:os]['name'] == 'Ubuntu'
             { :api_package_name => 'aodh-api',
               :api_service_name => 'httpd' }
           else
@@ -213,7 +210,7 @@ describe 'aodh::api' do
         end
       end
 
-      if facts[:osfamily] == 'Debian' and facts[:operatingsystem] != 'Ubuntu'
+      if facts[:os]['family'] == 'Debian' and facts[:os]['name'] != 'Ubuntu'
         it_behaves_like 'aodh-api with standalone service'
       else
         it_behaves_like 'aodh-api without standalone service'
diff --git a/spec/classes/aodh_client_spec.rb b/spec/classes/aodh_client_spec.rb
index 4a407f9b..9a8534eb 100644
--- a/spec/classes/aodh_client_spec.rb
+++ b/spec/classes/aodh_client_spec.rb
@@ -27,7 +27,7 @@ describe 'aodh::client' do
       end
 
       let(:platform_params) do
-        case facts[:osfamily]
+        case facts[:os]['family']
         when 'Debian'
           { :client_package_name => 'python3-aodhclient' }
         when 'RedHat'
diff --git a/spec/classes/aodh_db_sync_spec.rb b/spec/classes/aodh_db_sync_spec.rb
index 79aff405..d55158b6 100644
--- a/spec/classes/aodh_db_sync_spec.rb
+++ b/spec/classes/aodh_db_sync_spec.rb
@@ -57,10 +57,7 @@ describe 'aodh::db::sync' do
   }).each do |os,facts|
     context "on #{os}" do
       let (:facts) do
-        facts.merge(OSDefaults.get_facts({
-          :os_workers     => 8,
-          :concat_basedir => '/var/lib/puppet/concat'
-        }))
+        facts.merge(OSDefaults.get_facts())
       end
 
       it_configures 'aodh-dbsync'
diff --git a/spec/classes/aodh_evaluator_spec.rb b/spec/classes/aodh_evaluator_spec.rb
index dccaf63e..be377579 100644
--- a/spec/classes/aodh_evaluator_spec.rb
+++ b/spec/classes/aodh_evaluator_spec.rb
@@ -110,7 +110,7 @@ describe 'aodh::evaluator' do
       end
 
       let(:platform_params) do
-        case facts[:osfamily]
+        case facts[:os]['family']
         when 'Debian'
           { :evaluator_package_name => 'aodh-evaluator',
             :evaluator_service_name => 'aodh-evaluator' }
diff --git a/spec/classes/aodh_expirer_spec.rb b/spec/classes/aodh_expirer_spec.rb
index 0ac8ce9c..7a36a5ec 100644
--- a/spec/classes/aodh_expirer_spec.rb
+++ b/spec/classes/aodh_expirer_spec.rb
@@ -79,7 +79,7 @@ describe 'aodh::expirer' do
       end
 
       let(:platform_params) do
-        case facts[:osfamily]
+        case facts[:os]['family']
         when 'Debian'
           { :expirer_package_name => 'aodh-expirer' }
         when 'RedHat'
diff --git a/spec/classes/aodh_init_spec.rb b/spec/classes/aodh_init_spec.rb
index 264c3d11..0e04f0f1 100644
--- a/spec/classes/aodh_init_spec.rb
+++ b/spec/classes/aodh_init_spec.rb
@@ -164,7 +164,7 @@ describe 'aodh' do
       end
 
       let(:platform_params) do
-        case facts[:osfamily]
+        case facts[:os]['family']
         when 'Debian'
           { :aodh_common_package => 'aodh-common' }
         when 'RedHat'
diff --git a/spec/classes/aodh_listener_spec.rb b/spec/classes/aodh_listener_spec.rb
index 7944766f..0bbb16d9 100644
--- a/spec/classes/aodh_listener_spec.rb
+++ b/spec/classes/aodh_listener_spec.rb
@@ -96,7 +96,7 @@ describe 'aodh::listener' do
       end
 
       let(:platform_params) do
-        case facts[:osfamily]
+        case facts[:os]['family']
         when 'Debian'
           { :listener_package_name => 'aodh-listener',
             :listener_service_name => 'aodh-listener' }
diff --git a/spec/classes/aodh_notifier_spec.rb b/spec/classes/aodh_notifier_spec.rb
index 393065da..8222890b 100644
--- a/spec/classes/aodh_notifier_spec.rb
+++ b/spec/classes/aodh_notifier_spec.rb
@@ -101,7 +101,7 @@ describe 'aodh::notifier' do
       end
 
       let(:platform_params) do
-        case facts[:osfamily]
+        case facts[:os]['family']
         when 'Debian'
           { :notifier_package_name => 'aodh-notifier',
             :notifier_service_name => 'aodh-notifier' }
diff --git a/spec/classes/aodh_wsgi_apache_spec.rb b/spec/classes/aodh_wsgi_apache_spec.rb
index 473a53ca..7292b890 100644
--- a/spec/classes/aodh_wsgi_apache_spec.rb
+++ b/spec/classes/aodh_wsgi_apache_spec.rb
@@ -10,7 +10,7 @@ describe 'aodh::wsgi::apache' do
         :group                       => 'aodh',
         :path                        => '/',
         :priority                    => 10,
-        :servername                  => facts[:fqdn],
+        :servername                  => 'foo.example.com',
         :ssl                         => false,
         :threads                     => 1,
         :user                        => 'aodh',
@@ -149,14 +149,12 @@ describe 'aodh::wsgi::apache' do
     context "on #{os}" do
       let (:facts) do
         facts.merge!(OSDefaults.get_facts({
-          :os_workers     => 8,
-          :concat_basedir => '/var/lib/puppet/concat',
-          :fqdn           => 'some.host.tld'
+          :os_workers => 8,
         }))
       end
 
       let(:platform_params) do
-        case facts[:osfamily]
+        case facts[:os]['family']
         when 'Debian'
           {
             :wsgi_script_path   => '/usr/lib/cgi-bin/aodh',