From bb298e6f1f6f8264ccca59f764af1593700b5fe9 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 14 Mar 2022 08:45:15 +0900
Subject: [PATCH] Inject facts provided by Puppet OpenStack modules

This change ensures the facts provided by Puppet OpenStack modules
(e.g. $::os_workers) are injected in unit tests, to avoid unexpected
lookup failure caused by undefined values.

Closes-Bug: #1964729
Change-Id: I675597d13c51e64338b272228b0dbaa7be0fc458
---
 spec/classes/tripleo_config_spec.rb                             | 2 +-
 spec/classes/tripleo_firewall_spec.rb                           | 2 +-
 spec/classes/tripleo_haproxy_spec.rb                            | 2 +-
 spec/classes/tripleo_haproxy_stats_spec.rb                      | 2 +-
 spec/classes/tripleo_masquerade_networks_spec.rb                | 2 +-
 spec/classes/tripleo_packages_spec.rb                           | 2 +-
 spec/classes/tripleo_profile_base_aodh_api_spec.rb              | 2 +-
 spec/classes/tripleo_profile_base_aodh_authtoken_spec.rb        | 2 +-
 spec/classes/tripleo_profile_base_aodh_evaluator_spec.rb        | 2 +-
 spec/classes/tripleo_profile_base_aodh_listener_spec.rb         | 2 +-
 spec/classes/tripleo_profile_base_aodh_notifier_spec.rb         | 2 +-
 spec/classes/tripleo_profile_base_aodh_spec.rb                  | 2 +-
 spec/classes/tripleo_profile_base_apache_spec.rb                | 2 +-
 spec/classes/tripleo_profile_base_barbican_api_spec.rb          | 2 +-
 spec/classes/tripleo_profile_base_barbican_authtoken_spec.rb    | 2 +-
 spec/classes/tripleo_profile_base_barbican_spec.rb              | 2 +-
 .../tripleo_profile_base_ceilometer_agent_notification_spec.rb  | 2 +-
 .../tripleo_profile_base_ceilometer_agent_polling_spec.rb       | 2 +-
 spec/classes/tripleo_profile_base_ceilometer_spec.rb            | 2 +-
 spec/classes/tripleo_profile_base_cinder_api_spec.rb            | 2 +-
 spec/classes/tripleo_profile_base_cinder_authtoken_spec.rb      | 2 +-
 spec/classes/tripleo_profile_base_cinder_backup_ceph_spec.rb    | 2 +-
 spec/classes/tripleo_profile_base_cinder_backup_gcs_spec.rb     | 2 +-
 spec/classes/tripleo_profile_base_cinder_backup_nfs_spec.rb     | 2 +-
 spec/classes/tripleo_profile_base_cinder_backup_s3_spec.rb      | 2 +-
 spec/classes/tripleo_profile_base_cinder_backup_spec.rb         | 2 +-
 spec/classes/tripleo_profile_base_cinder_backup_swift_spec.rb   | 2 +-
 spec/classes/tripleo_profile_base_cinder_powerflex_spec.rb      | 2 +-
 spec/classes/tripleo_profile_base_cinder_powermax_spec.rb       | 2 +-
 spec/classes/tripleo_profile_base_cinder_powerstore_spec.rb     | 2 +-
 spec/classes/tripleo_profile_base_cinder_sc_spec.rb             | 2 +-
 spec/classes/tripleo_profile_base_cinder_scheduler_spec.rb      | 2 +-
 spec/classes/tripleo_profile_base_cinder_spec.rb                | 2 +-
 spec/classes/tripleo_profile_base_cinder_unity_spec.rb          | 2 +-
 spec/classes/tripleo_profile_base_cinder_vnx_spec.rb            | 2 +-
 spec/classes/tripleo_profile_base_cinder_volume_dellsc_spec.rb  | 2 +-
 spec/classes/tripleo_profile_base_cinder_volume_iscsi_spec.rb   | 2 +-
 spec/classes/tripleo_profile_base_cinder_volume_netapp_spec.rb  | 2 +-
 spec/classes/tripleo_profile_base_cinder_volume_nfs_spec.rb     | 2 +-
 spec/classes/tripleo_profile_base_cinder_volume_nvmeof_spec.rb  | 2 +-
 spec/classes/tripleo_profile_base_cinder_volume_pure_spec.rb    | 2 +-
 spec/classes/tripleo_profile_base_cinder_volume_rbd_spec.rb     | 2 +-
 spec/classes/tripleo_profile_base_cinder_volume_spec.rb         | 2 +-
 spec/classes/tripleo_profile_base_cinder_xtremio_spec.rb        | 2 +-
 spec/classes/tripleo_profile_base_database_mysql_client_spec.rb | 2 +-
 spec/classes/tripleo_profile_base_database_mysql_spec.rb        | 2 +-
 spec/classes/tripleo_profile_base_database_redis_spec.rb        | 2 +-
 spec/classes/tripleo_profile_base_designate_api_spec.rb         | 2 +-
 spec/classes/tripleo_profile_base_designate_authtoken_spec.rb   | 2 +-
 spec/classes/tripleo_profile_base_designate_backend_spec.rb     | 2 +-
 spec/classes/tripleo_profile_base_designate_central_spec.rb     | 2 +-
 spec/classes/tripleo_profile_base_designate_mdns_spec.rb        | 2 +-
 spec/classes/tripleo_profile_base_designate_producer_spec.rb    | 2 +-
 spec/classes/tripleo_profile_base_designate_sink_spec.rb        | 2 +-
 spec/classes/tripleo_profile_base_designate_spec.rb             | 2 +-
 spec/classes/tripleo_profile_base_designate_worker_spec.rb      | 2 +-
 spec/classes/tripleo_profile_base_etcd_spec.rb                  | 2 +-
 spec/classes/tripleo_profile_base_glance_api_spec.rb            | 2 +-
 spec/classes/tripleo_profile_base_glance_authtoken_spec.rb      | 2 +-
 spec/classes/tripleo_profile_base_glance_backend_cinder_spec.rb | 2 +-
 spec/classes/tripleo_profile_base_glance_backend_file_spec.rb   | 2 +-
 spec/classes/tripleo_profile_base_glance_backend_rbd_spec.rb    | 2 +-
 spec/classes/tripleo_profile_base_glance_backend_swift_spec.rb  | 2 +-
 spec/classes/tripleo_profile_base_gnocchi_api_spec.rb           | 2 +-
 spec/classes/tripleo_profile_base_gnocchi_authtoken_spec.rb     | 2 +-
 spec/classes/tripleo_profile_base_gnocchi_metricd_spec.rb       | 2 +-
 spec/classes/tripleo_profile_base_gnocchi_spec.rb               | 2 +-
 spec/classes/tripleo_profile_base_gnocchi_statsd_spec.rb        | 2 +-
 spec/classes/tripleo_profile_base_heat_api_cfn_spec.rb          | 2 +-
 spec/classes/tripleo_profile_base_heat_api_spec.rb              | 2 +-
 spec/classes/tripleo_profile_base_heat_authtoken_spec.rb        | 2 +-
 spec/classes/tripleo_profile_base_heat_engine_spec.rb           | 2 +-
 spec/classes/tripleo_profile_base_heat_spec.rb                  | 2 +-
 spec/classes/tripleo_profile_base_horizon_spec.rb               | 2 +-
 spec/classes/tripleo_profile_base_ironic_api_spec.rb            | 2 +-
 spec/classes/tripleo_profile_base_ironic_authtoken_spec.rb      | 2 +-
 .../tripleo_profile_base_ironic_inspector_authtoken_spec.rb     | 2 +-
 spec/classes/tripleo_profile_base_ironic_inspector_spec.rb      | 2 +-
 spec/classes/tripleo_profile_base_ironic_spec.rb                | 2 +-
 spec/classes/tripleo_profile_base_iscsid_spec.rb                | 2 +-
 spec/classes/tripleo_profile_base_keystone_spec.rb              | 2 +-
 spec/classes/tripleo_profile_base_lvm_spec.rb                   | 2 +-
 spec/classes/tripleo_profile_base_manila_api_spec.rb            | 2 +-
 spec/classes/tripleo_profile_base_manila_authtoken_spec.rb      | 2 +-
 spec/classes/tripleo_profile_base_manila_scheduler_spec.rb      | 2 +-
 spec/classes/tripleo_profile_base_manila_share_spec.rb          | 2 +-
 spec/classes/tripleo_profile_base_manila_spec.rb                | 2 +-
 spec/classes/tripleo_profile_base_memcached_spec.rb             | 2 +-
 spec/classes/tripleo_profile_base_metrics_qdr_spec.rb           | 2 +-
 spec/classes/tripleo_profile_base_neutron_authtoken_spec.rb     | 2 +-
 spec/classes/tripleo_profile_base_neutron_dhcp_spec.rb          | 2 +-
 spec/classes/tripleo_profile_base_neutron_l3_spec.rb            | 2 +-
 spec/classes/tripleo_profile_base_neutron_ml2_vts_spec.rb       | 2 +-
 spec/classes/tripleo_profile_base_neutron_ovs_spec.rb           | 2 +-
 spec/classes/tripleo_profile_base_neutron_server_spec.rb        | 2 +-
 spec/classes/tripleo_profile_base_neutron_spec.rb               | 2 +-
 spec/classes/tripleo_profile_base_nova_api_spec.rb              | 2 +-
 spec/classes/tripleo_profile_base_nova_authtoken_spec.rb        | 2 +-
 spec/classes/tripleo_profile_base_nova_compute_ironic_spec.rb   | 2 +-
 spec/classes/tripleo_profile_base_nova_compute_libvirt_spec.rb  | 2 +-
 spec/classes/tripleo_profile_base_nova_compute_spec.rb          | 2 +-
 spec/classes/tripleo_profile_base_nova_conductor_spec.rb        | 2 +-
 spec/classes/tripleo_profile_base_nova_libvirt_spec.rb          | 2 +-
 spec/classes/tripleo_profile_base_nova_metadata_spec.rb         | 2 +-
 spec/classes/tripleo_profile_base_nova_migration_client_spec.rb | 2 +-
 spec/classes/tripleo_profile_base_nova_migration_proxy_spec.rb  | 2 +-
 spec/classes/tripleo_profile_base_nova_migration_target_spec.rb | 2 +-
 spec/classes/tripleo_profile_base_nova_scheduler_spec.rb        | 2 +-
 spec/classes/tripleo_profile_base_nova_spec.rb                  | 2 +-
 spec/classes/tripleo_profile_base_nova_vncproxy_spec.rb         | 2 +-
 spec/classes/tripleo_profile_base_novajoin_authtoken_spec.rb    | 2 +-
 spec/classes/tripleo_profile_base_novajoin_spec.rb              | 2 +-
 spec/classes/tripleo_profile_base_octavia_api_spec.rb           | 2 +-
 spec/classes/tripleo_profile_base_octavia_authtoken_spec.rb     | 2 +-
 .../classes/tripleo_profile_base_octavia_health_manager_spec.rb | 2 +-
 spec/classes/tripleo_profile_base_octavia_housekeeping_spec.rb  | 2 +-
 spec/classes/tripleo_profile_base_octavia_provider_ovn_spec.rb  | 2 +-
 spec/classes/tripleo_profile_base_octavia_spec.rb               | 2 +-
 spec/classes/tripleo_profile_base_octavia_worker_spec.rb        | 2 +-
 spec/classes/tripleo_profile_base_pacemaker_spec.rb             | 2 +-
 spec/classes/tripleo_profile_base_placement_api_spec.rb         | 2 +-
 spec/classes/tripleo_profile_base_placement_authtoken_spec.rb   | 2 +-
 spec/classes/tripleo_profile_base_placement_spec.rb             | 2 +-
 spec/classes/tripleo_profile_base_qdr_spec.rb                   | 2 +-
 spec/classes/tripleo_profile_base_swift_proxy_spec.rb           | 2 +-
 spec/classes/tripleo_profile_base_swift_ringbuilder_spec.rb     | 2 +-
 spec/classes/tripleo_profile_base_swift_spec.rb                 | 2 +-
 .../tripleo_profile_pacemaker_cinder_backup_bundle_spec.rb      | 2 +-
 .../tripleo_profile_pacemaker_cinder_volume_bundle_spec.rb      | 2 +-
 .../tripleo_profile_pacemaker_manila_share_bundle_spec.rb       | 2 +-
 spec/defines/tripleo_firewall_service_rules_spec.rb             | 2 +-
 spec/defines/tripleo_haproxy_endpoint_spec.rb                   | 2 +-
 spec/defines/tripleo_haproxy_service_endpoints_spec.rb          | 2 +-
 spec/defines/tripleo_haproxy_userlist_spec.rb                   | 2 +-
 spec/defines/tripleo_profile_base_database_mysql_user_spec.rb   | 2 +-
 .../tripleo_profile_base_logging_rsyslog_file_input_spec.rb     | 2 +-
 ...leo_profile_base_metrics_collectd_sensubility_script_spec.rb | 2 +-
 ...tripleo_profile_base_neutron_wrappers_dibbler_client_spec.rb | 2 +-
 .../tripleo_profile_base_neutron_wrappers_dnsmasq_spec.rb       | 2 +-
 .../tripleo_profile_base_neutron_wrappers_haproxy_spec.rb       | 2 +-
 .../tripleo_profile_base_neutron_wrappers_keepalived_spec.rb    | 2 +-
 ...rofile_base_neutron_wrappers_keepalived_state_change_spec.rb | 2 +-
 .../defines/tripleo_profile_base_neutron_wrappers_radvd_spec.rb | 2 +-
 143 files changed, 143 insertions(+), 143 deletions(-)

diff --git a/spec/classes/tripleo_config_spec.rb b/spec/classes/tripleo_config_spec.rb
index 6b4d73fc6..cd2942a52 100644
--- a/spec/classes/tripleo_config_spec.rb
+++ b/spec/classes/tripleo_config_spec.rb
@@ -36,7 +36,7 @@ describe 'tripleo::config' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({})
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::config'
diff --git a/spec/classes/tripleo_firewall_spec.rb b/spec/classes/tripleo_firewall_spec.rb
index 69c3d241f..37b373a0c 100644
--- a/spec/classes/tripleo_firewall_spec.rb
+++ b/spec/classes/tripleo_firewall_spec.rb
@@ -217,7 +217,7 @@ describe 'tripleo::firewall' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({})
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::firewall'
diff --git a/spec/classes/tripleo_haproxy_spec.rb b/spec/classes/tripleo_haproxy_spec.rb
index bd62a686a..66a455765 100644
--- a/spec/classes/tripleo_haproxy_spec.rb
+++ b/spec/classes/tripleo_haproxy_spec.rb
@@ -235,7 +235,7 @@ describe 'tripleo::haproxy' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::haproxy'
diff --git a/spec/classes/tripleo_haproxy_stats_spec.rb b/spec/classes/tripleo_haproxy_stats_spec.rb
index bad5bf1a6..5e5d18f5d 100644
--- a/spec/classes/tripleo_haproxy_stats_spec.rb
+++ b/spec/classes/tripleo_haproxy_stats_spec.rb
@@ -95,7 +95,7 @@ describe 'tripleo::haproxy::stats' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({})
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::haproxy::stats'
diff --git a/spec/classes/tripleo_masquerade_networks_spec.rb b/spec/classes/tripleo_masquerade_networks_spec.rb
index d50db6dce..afcb0d9e2 100644
--- a/spec/classes/tripleo_masquerade_networks_spec.rb
+++ b/spec/classes/tripleo_masquerade_networks_spec.rb
@@ -86,7 +86,7 @@ describe 'tripleo::masquerade_networks' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({})
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::masquerade_networks'
diff --git a/spec/classes/tripleo_packages_spec.rb b/spec/classes/tripleo_packages_spec.rb
index 8db238af2..c41792e39 100644
--- a/spec/classes/tripleo_packages_spec.rb
+++ b/spec/classes/tripleo_packages_spec.rb
@@ -39,7 +39,7 @@ describe 'tripleo::packages' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({})
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::packages'
diff --git a/spec/classes/tripleo_profile_base_aodh_api_spec.rb b/spec/classes/tripleo_profile_base_aodh_api_spec.rb
index 06cc813f5..a3cdbbd41 100644
--- a/spec/classes/tripleo_profile_base_aodh_api_spec.rb
+++ b/spec/classes/tripleo_profile_base_aodh_api_spec.rb
@@ -112,7 +112,7 @@ describe 'tripleo::profile::base::aodh::api' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::aodh::api'
diff --git a/spec/classes/tripleo_profile_base_aodh_authtoken_spec.rb b/spec/classes/tripleo_profile_base_aodh_authtoken_spec.rb
index 6a12f321d..3973a7ccc 100644
--- a/spec/classes/tripleo_profile_base_aodh_authtoken_spec.rb
+++ b/spec/classes/tripleo_profile_base_aodh_authtoken_spec.rb
@@ -61,7 +61,7 @@ describe 'tripleo::profile::base::aodh::authtoken' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::aodh::authtoken'
diff --git a/spec/classes/tripleo_profile_base_aodh_evaluator_spec.rb b/spec/classes/tripleo_profile_base_aodh_evaluator_spec.rb
index 0804f2ac8..0703e1aa3 100644
--- a/spec/classes/tripleo_profile_base_aodh_evaluator_spec.rb
+++ b/spec/classes/tripleo_profile_base_aodh_evaluator_spec.rb
@@ -53,7 +53,7 @@ describe 'tripleo::profile::base::aodh::evaluator' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::aodh::evaluator'
diff --git a/spec/classes/tripleo_profile_base_aodh_listener_spec.rb b/spec/classes/tripleo_profile_base_aodh_listener_spec.rb
index 035c4ac64..917757417 100644
--- a/spec/classes/tripleo_profile_base_aodh_listener_spec.rb
+++ b/spec/classes/tripleo_profile_base_aodh_listener_spec.rb
@@ -47,7 +47,7 @@ describe 'tripleo::profile::base::aodh::listener' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::aodh::listener'
diff --git a/spec/classes/tripleo_profile_base_aodh_notifier_spec.rb b/spec/classes/tripleo_profile_base_aodh_notifier_spec.rb
index d33a08b99..ef3352186 100644
--- a/spec/classes/tripleo_profile_base_aodh_notifier_spec.rb
+++ b/spec/classes/tripleo_profile_base_aodh_notifier_spec.rb
@@ -47,7 +47,7 @@ describe 'tripleo::profile::base::aodh::notifier' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::aodh::notifier'
diff --git a/spec/classes/tripleo_profile_base_aodh_spec.rb b/spec/classes/tripleo_profile_base_aodh_spec.rb
index 87bb982a0..fbfc3ab98 100644
--- a/spec/classes/tripleo_profile_base_aodh_spec.rb
+++ b/spec/classes/tripleo_profile_base_aodh_spec.rb
@@ -89,7 +89,7 @@ describe 'tripleo::profile::base::aodh' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::aodh'
diff --git a/spec/classes/tripleo_profile_base_apache_spec.rb b/spec/classes/tripleo_profile_base_apache_spec.rb
index b37b8082f..c23e6e63f 100644
--- a/spec/classes/tripleo_profile_base_apache_spec.rb
+++ b/spec/classes/tripleo_profile_base_apache_spec.rb
@@ -73,7 +73,7 @@ describe 'tripleo::profile::base::apache' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::apache'
diff --git a/spec/classes/tripleo_profile_base_barbican_api_spec.rb b/spec/classes/tripleo_profile_base_barbican_api_spec.rb
index 2c7410112..2a29135a7 100644
--- a/spec/classes/tripleo_profile_base_barbican_api_spec.rb
+++ b/spec/classes/tripleo_profile_base_barbican_api_spec.rb
@@ -103,7 +103,7 @@ describe 'tripleo::profile::base::barbican::api' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::barbican::api'
diff --git a/spec/classes/tripleo_profile_base_barbican_authtoken_spec.rb b/spec/classes/tripleo_profile_base_barbican_authtoken_spec.rb
index 3cbbf0d3e..0e0753af1 100644
--- a/spec/classes/tripleo_profile_base_barbican_authtoken_spec.rb
+++ b/spec/classes/tripleo_profile_base_barbican_authtoken_spec.rb
@@ -61,7 +61,7 @@ describe 'tripleo::profile::base::barbican::authtoken' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::barbican::authtoken'
diff --git a/spec/classes/tripleo_profile_base_barbican_spec.rb b/spec/classes/tripleo_profile_base_barbican_spec.rb
index 4dfaa11d4..b2a159cfb 100644
--- a/spec/classes/tripleo_profile_base_barbican_spec.rb
+++ b/spec/classes/tripleo_profile_base_barbican_spec.rb
@@ -47,7 +47,7 @@ describe 'tripleo::profile::base::barbican' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::barbican'
diff --git a/spec/classes/tripleo_profile_base_ceilometer_agent_notification_spec.rb b/spec/classes/tripleo_profile_base_ceilometer_agent_notification_spec.rb
index 8e3bc6ba8..1b05bf462 100644
--- a/spec/classes/tripleo_profile_base_ceilometer_agent_notification_spec.rb
+++ b/spec/classes/tripleo_profile_base_ceilometer_agent_notification_spec.rb
@@ -60,7 +60,7 @@ describe 'tripleo::profile::base::ceilometer::agent::notification' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::ceilometer::agent::notification'
diff --git a/spec/classes/tripleo_profile_base_ceilometer_agent_polling_spec.rb b/spec/classes/tripleo_profile_base_ceilometer_agent_polling_spec.rb
index 5b86375e9..4c0fbbab3 100644
--- a/spec/classes/tripleo_profile_base_ceilometer_agent_polling_spec.rb
+++ b/spec/classes/tripleo_profile_base_ceilometer_agent_polling_spec.rb
@@ -63,7 +63,7 @@ describe 'tripleo::profile::base::ceilometer::agent::polling' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::ceilometer::agent::polling'
diff --git a/spec/classes/tripleo_profile_base_ceilometer_spec.rb b/spec/classes/tripleo_profile_base_ceilometer_spec.rb
index 965ef79e7..6298eff69 100644
--- a/spec/classes/tripleo_profile_base_ceilometer_spec.rb
+++ b/spec/classes/tripleo_profile_base_ceilometer_spec.rb
@@ -51,7 +51,7 @@ describe 'tripleo::profile::base::ceilometer' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::ceilometer'
diff --git a/spec/classes/tripleo_profile_base_cinder_api_spec.rb b/spec/classes/tripleo_profile_base_cinder_api_spec.rb
index 892d32268..254cab49c 100644
--- a/spec/classes/tripleo_profile_base_cinder_api_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_api_spec.rb
@@ -113,7 +113,7 @@ describe 'tripleo::profile::base::cinder::api' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::cinder::api'
diff --git a/spec/classes/tripleo_profile_base_cinder_authtoken_spec.rb b/spec/classes/tripleo_profile_base_cinder_authtoken_spec.rb
index a4e8262a7..ced23b2c1 100644
--- a/spec/classes/tripleo_profile_base_cinder_authtoken_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_authtoken_spec.rb
@@ -61,7 +61,7 @@ describe 'tripleo::profile::base::cinder::authtoken' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::cinder::authtoken'
diff --git a/spec/classes/tripleo_profile_base_cinder_backup_ceph_spec.rb b/spec/classes/tripleo_profile_base_cinder_backup_ceph_spec.rb
index 574eeee13..2900d30a6 100644
--- a/spec/classes/tripleo_profile_base_cinder_backup_ceph_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_backup_ceph_spec.rb
@@ -50,7 +50,7 @@ describe 'tripleo::profile::base::cinder::backup::ceph' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::cinder::backup::ceph'
diff --git a/spec/classes/tripleo_profile_base_cinder_backup_gcs_spec.rb b/spec/classes/tripleo_profile_base_cinder_backup_gcs_spec.rb
index f5419ab76..2bd8c81c7 100644
--- a/spec/classes/tripleo_profile_base_cinder_backup_gcs_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_backup_gcs_spec.rb
@@ -75,7 +75,7 @@ describe 'tripleo::profile::base::cinder::backup::gcs' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::cinder::backup::gcs'
diff --git a/spec/classes/tripleo_profile_base_cinder_backup_nfs_spec.rb b/spec/classes/tripleo_profile_base_cinder_backup_nfs_spec.rb
index 9fbb7e4be..00d58311d 100644
--- a/spec/classes/tripleo_profile_base_cinder_backup_nfs_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_backup_nfs_spec.rb
@@ -50,7 +50,7 @@ describe 'tripleo::profile::base::cinder::backup::nfs' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::cinder::backup::nfs'
diff --git a/spec/classes/tripleo_profile_base_cinder_backup_s3_spec.rb b/spec/classes/tripleo_profile_base_cinder_backup_s3_spec.rb
index 77b6aaf43..8a5ba38ab 100644
--- a/spec/classes/tripleo_profile_base_cinder_backup_s3_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_backup_s3_spec.rb
@@ -50,7 +50,7 @@ describe 'tripleo::profile::base::cinder::backup::s3' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::cinder::backup::s3'
diff --git a/spec/classes/tripleo_profile_base_cinder_backup_spec.rb b/spec/classes/tripleo_profile_base_cinder_backup_spec.rb
index fe101e1b6..43f454212 100644
--- a/spec/classes/tripleo_profile_base_cinder_backup_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_backup_spec.rb
@@ -47,7 +47,7 @@ describe 'tripleo::profile::base::cinder::backup' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::cinder::backup'
diff --git a/spec/classes/tripleo_profile_base_cinder_backup_swift_spec.rb b/spec/classes/tripleo_profile_base_cinder_backup_swift_spec.rb
index f757dface..f60ae373f 100644
--- a/spec/classes/tripleo_profile_base_cinder_backup_swift_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_backup_swift_spec.rb
@@ -50,7 +50,7 @@ describe 'tripleo::profile::base::cinder::backup::swift' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::cinder::backup::swift'
diff --git a/spec/classes/tripleo_profile_base_cinder_powerflex_spec.rb b/spec/classes/tripleo_profile_base_cinder_powerflex_spec.rb
index 4301f5178..3e0e51d1d 100644
--- a/spec/classes/tripleo_profile_base_cinder_powerflex_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_powerflex_spec.rb
@@ -49,7 +49,7 @@ describe 'tripleo::profile::base::cinder::volume::dellemc_powerflex' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::cinder::volume::dellemc_powerflex'
diff --git a/spec/classes/tripleo_profile_base_cinder_powermax_spec.rb b/spec/classes/tripleo_profile_base_cinder_powermax_spec.rb
index cc55e428d..956ae386c 100644
--- a/spec/classes/tripleo_profile_base_cinder_powermax_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_powermax_spec.rb
@@ -65,7 +65,7 @@ describe 'tripleo::profile::base::cinder::volume::dellemc_powermax' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::cinder::volume::dellemc_powermax'
diff --git a/spec/classes/tripleo_profile_base_cinder_powerstore_spec.rb b/spec/classes/tripleo_profile_base_cinder_powerstore_spec.rb
index 5301bf3a1..18dd4223c 100644
--- a/spec/classes/tripleo_profile_base_cinder_powerstore_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_powerstore_spec.rb
@@ -70,7 +70,7 @@ describe 'tripleo::profile::base::cinder::volume::dellemc_powerstore' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::cinder::volume::dellemc_powerstore'
diff --git a/spec/classes/tripleo_profile_base_cinder_sc_spec.rb b/spec/classes/tripleo_profile_base_cinder_sc_spec.rb
index 0f16b368c..b3c647e26 100644
--- a/spec/classes/tripleo_profile_base_cinder_sc_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_sc_spec.rb
@@ -63,7 +63,7 @@ describe 'tripleo::profile::base::cinder::volume::dellemc_sc' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::cinder::volume::dellemc_sc'
diff --git a/spec/classes/tripleo_profile_base_cinder_scheduler_spec.rb b/spec/classes/tripleo_profile_base_cinder_scheduler_spec.rb
index 10004401a..fa43a2520 100644
--- a/spec/classes/tripleo_profile_base_cinder_scheduler_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_scheduler_spec.rb
@@ -47,7 +47,7 @@ describe 'tripleo::profile::base::cinder::scheduler' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::cinder::scheduler'
diff --git a/spec/classes/tripleo_profile_base_cinder_spec.rb b/spec/classes/tripleo_profile_base_cinder_spec.rb
index 583ec94e4..4b4af6e2b 100644
--- a/spec/classes/tripleo_profile_base_cinder_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_spec.rb
@@ -179,7 +179,7 @@ describe 'tripleo::profile::base::cinder' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::cinder'
diff --git a/spec/classes/tripleo_profile_base_cinder_unity_spec.rb b/spec/classes/tripleo_profile_base_cinder_unity_spec.rb
index 38f362b23..17618ac44 100644
--- a/spec/classes/tripleo_profile_base_cinder_unity_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_unity_spec.rb
@@ -48,7 +48,7 @@ describe 'tripleo::profile::base::cinder::volume::dellemc_unity' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::cinder::volume::dellemc_unity'
diff --git a/spec/classes/tripleo_profile_base_cinder_vnx_spec.rb b/spec/classes/tripleo_profile_base_cinder_vnx_spec.rb
index 6076989e1..3d50881f2 100644
--- a/spec/classes/tripleo_profile_base_cinder_vnx_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_vnx_spec.rb
@@ -48,7 +48,7 @@ describe 'tripleo::profile::base::cinder::volume::dellemc_vnx' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::cinder::volume::dellemc_vnx'
diff --git a/spec/classes/tripleo_profile_base_cinder_volume_dellsc_spec.rb b/spec/classes/tripleo_profile_base_cinder_volume_dellsc_spec.rb
index 328e88691..ae9d8836e 100644
--- a/spec/classes/tripleo_profile_base_cinder_volume_dellsc_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_volume_dellsc_spec.rb
@@ -49,7 +49,7 @@ describe 'tripleo::profile::base::cinder::volume::dellsc' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::cinder::volume::dellsc'
diff --git a/spec/classes/tripleo_profile_base_cinder_volume_iscsi_spec.rb b/spec/classes/tripleo_profile_base_cinder_volume_iscsi_spec.rb
index c11c00b9e..6d40116d1 100644
--- a/spec/classes/tripleo_profile_base_cinder_volume_iscsi_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_volume_iscsi_spec.rb
@@ -74,7 +74,7 @@ describe 'tripleo::profile::base::cinder::volume::iscsi' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::cinder::volume::iscsi'
diff --git a/spec/classes/tripleo_profile_base_cinder_volume_netapp_spec.rb b/spec/classes/tripleo_profile_base_cinder_volume_netapp_spec.rb
index f9a89e26a..14b998097 100644
--- a/spec/classes/tripleo_profile_base_cinder_volume_netapp_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_volume_netapp_spec.rb
@@ -72,7 +72,7 @@ describe 'tripleo::profile::base::cinder::volume::netapp' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::cinder::volume::netapp'
diff --git a/spec/classes/tripleo_profile_base_cinder_volume_nfs_spec.rb b/spec/classes/tripleo_profile_base_cinder_volume_nfs_spec.rb
index 1fa4fa1bb..f206746f3 100644
--- a/spec/classes/tripleo_profile_base_cinder_volume_nfs_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_volume_nfs_spec.rb
@@ -102,7 +102,7 @@ describe 'tripleo::profile::base::cinder::volume::nfs' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::cinder::volume::nfs'
diff --git a/spec/classes/tripleo_profile_base_cinder_volume_nvmeof_spec.rb b/spec/classes/tripleo_profile_base_cinder_volume_nvmeof_spec.rb
index 69098fc6b..810756fbf 100644
--- a/spec/classes/tripleo_profile_base_cinder_volume_nvmeof_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_volume_nvmeof_spec.rb
@@ -65,7 +65,7 @@ describe 'tripleo::profile::base::cinder::volume::nvmeof' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::cinder::volume::nvmeof'
diff --git a/spec/classes/tripleo_profile_base_cinder_volume_pure_spec.rb b/spec/classes/tripleo_profile_base_cinder_volume_pure_spec.rb
index 9a8b4ae20..a5731a608 100644
--- a/spec/classes/tripleo_profile_base_cinder_volume_pure_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_volume_pure_spec.rb
@@ -65,7 +65,7 @@ describe 'tripleo::profile::base::cinder::volume::pure' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::cinder::volume::pure'
diff --git a/spec/classes/tripleo_profile_base_cinder_volume_rbd_spec.rb b/spec/classes/tripleo_profile_base_cinder_volume_rbd_spec.rb
index 0ee5cf6fb..ae7240f7e 100644
--- a/spec/classes/tripleo_profile_base_cinder_volume_rbd_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_volume_rbd_spec.rb
@@ -172,7 +172,7 @@ describe 'tripleo::profile::base::cinder::volume::rbd' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::cinder::volume::rbd'
diff --git a/spec/classes/tripleo_profile_base_cinder_volume_spec.rb b/spec/classes/tripleo_profile_base_cinder_volume_spec.rb
index 18231fd3d..a9df497c7 100644
--- a/spec/classes/tripleo_profile_base_cinder_volume_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_volume_spec.rb
@@ -465,7 +465,7 @@ describe 'tripleo::profile::base::cinder::volume' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::cinder::volume'
diff --git a/spec/classes/tripleo_profile_base_cinder_xtremio_spec.rb b/spec/classes/tripleo_profile_base_cinder_xtremio_spec.rb
index 887ce1914..c904414a3 100644
--- a/spec/classes/tripleo_profile_base_cinder_xtremio_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_xtremio_spec.rb
@@ -63,7 +63,7 @@ describe 'tripleo::profile::base::cinder::volume::dellemc_xtremio' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::cinder::volume::dellemc_xtremio'
diff --git a/spec/classes/tripleo_profile_base_database_mysql_client_spec.rb b/spec/classes/tripleo_profile_base_database_mysql_client_spec.rb
index 0a31022b2..fc0ff6d66 100644
--- a/spec/classes/tripleo_profile_base_database_mysql_client_spec.rb
+++ b/spec/classes/tripleo_profile_base_database_mysql_client_spec.rb
@@ -151,7 +151,7 @@ describe 'tripleo::profile::base::database::mysql::client' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::database::mysql::client'
diff --git a/spec/classes/tripleo_profile_base_database_mysql_spec.rb b/spec/classes/tripleo_profile_base_database_mysql_spec.rb
index 79dbd47ed..12066c055 100644
--- a/spec/classes/tripleo_profile_base_database_mysql_spec.rb
+++ b/spec/classes/tripleo_profile_base_database_mysql_spec.rb
@@ -32,7 +32,7 @@ describe 'tripleo::profile::base::database::mysql' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::database::mysql'
diff --git a/spec/classes/tripleo_profile_base_database_redis_spec.rb b/spec/classes/tripleo_profile_base_database_redis_spec.rb
index e634a26ab..a4702366a 100644
--- a/spec/classes/tripleo_profile_base_database_redis_spec.rb
+++ b/spec/classes/tripleo_profile_base_database_redis_spec.rb
@@ -46,7 +46,7 @@ describe 'tripleo::profile::base::database::redis' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::database::redis'
diff --git a/spec/classes/tripleo_profile_base_designate_api_spec.rb b/spec/classes/tripleo_profile_base_designate_api_spec.rb
index 58fe28fe0..c5cae860b 100644
--- a/spec/classes/tripleo_profile_base_designate_api_spec.rb
+++ b/spec/classes/tripleo_profile_base_designate_api_spec.rb
@@ -69,7 +69,7 @@ eos
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::designate::api'
diff --git a/spec/classes/tripleo_profile_base_designate_authtoken_spec.rb b/spec/classes/tripleo_profile_base_designate_authtoken_spec.rb
index b70bfb531..14606d5c2 100644
--- a/spec/classes/tripleo_profile_base_designate_authtoken_spec.rb
+++ b/spec/classes/tripleo_profile_base_designate_authtoken_spec.rb
@@ -61,7 +61,7 @@ describe 'tripleo::profile::base::designate::authtoken' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::designate::authtoken'
diff --git a/spec/classes/tripleo_profile_base_designate_backend_spec.rb b/spec/classes/tripleo_profile_base_designate_backend_spec.rb
index 1157f334b..1fe29aa27 100644
--- a/spec/classes/tripleo_profile_base_designate_backend_spec.rb
+++ b/spec/classes/tripleo_profile_base_designate_backend_spec.rb
@@ -47,7 +47,7 @@ describe 'tripleo::profile::base::designate::backend' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::designate::backend'
diff --git a/spec/classes/tripleo_profile_base_designate_central_spec.rb b/spec/classes/tripleo_profile_base_designate_central_spec.rb
index 19a2e4d20..0afb9e977 100644
--- a/spec/classes/tripleo_profile_base_designate_central_spec.rb
+++ b/spec/classes/tripleo_profile_base_designate_central_spec.rb
@@ -109,7 +109,7 @@ eos
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::designate::central'
diff --git a/spec/classes/tripleo_profile_base_designate_mdns_spec.rb b/spec/classes/tripleo_profile_base_designate_mdns_spec.rb
index 724734e41..f10095f67 100644
--- a/spec/classes/tripleo_profile_base_designate_mdns_spec.rb
+++ b/spec/classes/tripleo_profile_base_designate_mdns_spec.rb
@@ -58,7 +58,7 @@ eos
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::designate::mdns'
diff --git a/spec/classes/tripleo_profile_base_designate_producer_spec.rb b/spec/classes/tripleo_profile_base_designate_producer_spec.rb
index fa0c907ba..2155f8289 100644
--- a/spec/classes/tripleo_profile_base_designate_producer_spec.rb
+++ b/spec/classes/tripleo_profile_base_designate_producer_spec.rb
@@ -81,7 +81,7 @@ eos
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::designate::producer'
diff --git a/spec/classes/tripleo_profile_base_designate_sink_spec.rb b/spec/classes/tripleo_profile_base_designate_sink_spec.rb
index f04da7397..46187d97f 100644
--- a/spec/classes/tripleo_profile_base_designate_sink_spec.rb
+++ b/spec/classes/tripleo_profile_base_designate_sink_spec.rb
@@ -58,7 +58,7 @@ eos
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::designate::sink'
diff --git a/spec/classes/tripleo_profile_base_designate_spec.rb b/spec/classes/tripleo_profile_base_designate_spec.rb
index 8b98d883c..c88e6062c 100644
--- a/spec/classes/tripleo_profile_base_designate_spec.rb
+++ b/spec/classes/tripleo_profile_base_designate_spec.rb
@@ -58,7 +58,7 @@ describe 'tripleo::profile::base::designate' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::designate'
diff --git a/spec/classes/tripleo_profile_base_designate_worker_spec.rb b/spec/classes/tripleo_profile_base_designate_worker_spec.rb
index 1866dcc8c..115329f95 100644
--- a/spec/classes/tripleo_profile_base_designate_worker_spec.rb
+++ b/spec/classes/tripleo_profile_base_designate_worker_spec.rb
@@ -60,7 +60,7 @@ eos
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::designate::worker'
diff --git a/spec/classes/tripleo_profile_base_etcd_spec.rb b/spec/classes/tripleo_profile_base_etcd_spec.rb
index 929be197a..dc7fdec99 100644
--- a/spec/classes/tripleo_profile_base_etcd_spec.rb
+++ b/spec/classes/tripleo_profile_base_etcd_spec.rb
@@ -122,7 +122,7 @@ describe 'tripleo::profile::base::etcd' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({})
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::etcd'
diff --git a/spec/classes/tripleo_profile_base_glance_api_spec.rb b/spec/classes/tripleo_profile_base_glance_api_spec.rb
index a16607c39..3cb1c7a25 100644
--- a/spec/classes/tripleo_profile_base_glance_api_spec.rb
+++ b/spec/classes/tripleo_profile_base_glance_api_spec.rb
@@ -255,7 +255,7 @@ describe 'tripleo::profile::base::glance::api' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::glance::api'
diff --git a/spec/classes/tripleo_profile_base_glance_authtoken_spec.rb b/spec/classes/tripleo_profile_base_glance_authtoken_spec.rb
index bb0aa1ac1..3100bfa1c 100644
--- a/spec/classes/tripleo_profile_base_glance_authtoken_spec.rb
+++ b/spec/classes/tripleo_profile_base_glance_authtoken_spec.rb
@@ -61,7 +61,7 @@ describe 'tripleo::profile::base::glance::authtoken' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::glance::authtoken'
diff --git a/spec/classes/tripleo_profile_base_glance_backend_cinder_spec.rb b/spec/classes/tripleo_profile_base_glance_backend_cinder_spec.rb
index 34852e311..50bfbff66 100644
--- a/spec/classes/tripleo_profile_base_glance_backend_cinder_spec.rb
+++ b/spec/classes/tripleo_profile_base_glance_backend_cinder_spec.rb
@@ -128,7 +128,7 @@ describe 'tripleo::profile::base::glance::backend::cinder' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({})
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::glance::backend::cinder'
diff --git a/spec/classes/tripleo_profile_base_glance_backend_file_spec.rb b/spec/classes/tripleo_profile_base_glance_backend_file_spec.rb
index 2b13484ce..cbe0c140f 100644
--- a/spec/classes/tripleo_profile_base_glance_backend_file_spec.rb
+++ b/spec/classes/tripleo_profile_base_glance_backend_file_spec.rb
@@ -96,7 +96,7 @@ describe 'tripleo::profile::base::glance::backend::file' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({})
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::glance::backend::file'
diff --git a/spec/classes/tripleo_profile_base_glance_backend_rbd_spec.rb b/spec/classes/tripleo_profile_base_glance_backend_rbd_spec.rb
index 21e362a16..ce713fe8c 100644
--- a/spec/classes/tripleo_profile_base_glance_backend_rbd_spec.rb
+++ b/spec/classes/tripleo_profile_base_glance_backend_rbd_spec.rb
@@ -137,7 +137,7 @@ describe 'tripleo::profile::base::glance::backend::rbd' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({})
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::glance::backend::rbd'
diff --git a/spec/classes/tripleo_profile_base_glance_backend_swift_spec.rb b/spec/classes/tripleo_profile_base_glance_backend_swift_spec.rb
index 1528ff364..8093b55cd 100644
--- a/spec/classes/tripleo_profile_base_glance_backend_swift_spec.rb
+++ b/spec/classes/tripleo_profile_base_glance_backend_swift_spec.rb
@@ -89,7 +89,7 @@ describe 'tripleo::profile::base::glance::backend::swift' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({})
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::glance::backend::swift'
diff --git a/spec/classes/tripleo_profile_base_gnocchi_api_spec.rb b/spec/classes/tripleo_profile_base_gnocchi_api_spec.rb
index 3ed47be60..f192b9d20 100644
--- a/spec/classes/tripleo_profile_base_gnocchi_api_spec.rb
+++ b/spec/classes/tripleo_profile_base_gnocchi_api_spec.rb
@@ -172,7 +172,7 @@ eos
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::gnocchi::api'
diff --git a/spec/classes/tripleo_profile_base_gnocchi_authtoken_spec.rb b/spec/classes/tripleo_profile_base_gnocchi_authtoken_spec.rb
index 02651aa44..7a0fb019e 100644
--- a/spec/classes/tripleo_profile_base_gnocchi_authtoken_spec.rb
+++ b/spec/classes/tripleo_profile_base_gnocchi_authtoken_spec.rb
@@ -61,7 +61,7 @@ describe 'tripleo::profile::base::gnocchi::authtoken' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::gnocchi::authtoken'
diff --git a/spec/classes/tripleo_profile_base_gnocchi_metricd_spec.rb b/spec/classes/tripleo_profile_base_gnocchi_metricd_spec.rb
index 27c02a61b..c1d3971c8 100644
--- a/spec/classes/tripleo_profile_base_gnocchi_metricd_spec.rb
+++ b/spec/classes/tripleo_profile_base_gnocchi_metricd_spec.rb
@@ -60,7 +60,7 @@ eos
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::gnocchi::metricd'
diff --git a/spec/classes/tripleo_profile_base_gnocchi_spec.rb b/spec/classes/tripleo_profile_base_gnocchi_spec.rb
index 23c8faa25..1e87eb5d5 100644
--- a/spec/classes/tripleo_profile_base_gnocchi_spec.rb
+++ b/spec/classes/tripleo_profile_base_gnocchi_spec.rb
@@ -93,7 +93,7 @@ describe 'tripleo::profile::base::gnocchi' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::gnocchi'
diff --git a/spec/classes/tripleo_profile_base_gnocchi_statsd_spec.rb b/spec/classes/tripleo_profile_base_gnocchi_statsd_spec.rb
index 30ed837d4..0c6f61363 100644
--- a/spec/classes/tripleo_profile_base_gnocchi_statsd_spec.rb
+++ b/spec/classes/tripleo_profile_base_gnocchi_statsd_spec.rb
@@ -60,7 +60,7 @@ eos
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::gnocchi::statsd'
diff --git a/spec/classes/tripleo_profile_base_heat_api_cfn_spec.rb b/spec/classes/tripleo_profile_base_heat_api_cfn_spec.rb
index f1101a969..d8171ed5c 100644
--- a/spec/classes/tripleo_profile_base_heat_api_cfn_spec.rb
+++ b/spec/classes/tripleo_profile_base_heat_api_cfn_spec.rb
@@ -100,7 +100,7 @@ eos
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::heat::api_cfn'
diff --git a/spec/classes/tripleo_profile_base_heat_api_spec.rb b/spec/classes/tripleo_profile_base_heat_api_spec.rb
index a0079eb2a..013fa68ee 100644
--- a/spec/classes/tripleo_profile_base_heat_api_spec.rb
+++ b/spec/classes/tripleo_profile_base_heat_api_spec.rb
@@ -100,7 +100,7 @@ eos
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::heat::api'
diff --git a/spec/classes/tripleo_profile_base_heat_authtoken_spec.rb b/spec/classes/tripleo_profile_base_heat_authtoken_spec.rb
index 78b0106dc..b4ffead91 100644
--- a/spec/classes/tripleo_profile_base_heat_authtoken_spec.rb
+++ b/spec/classes/tripleo_profile_base_heat_authtoken_spec.rb
@@ -61,7 +61,7 @@ describe 'tripleo::profile::base::heat::authtoken' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::heat::authtoken'
diff --git a/spec/classes/tripleo_profile_base_heat_engine_spec.rb b/spec/classes/tripleo_profile_base_heat_engine_spec.rb
index b40e19355..29d2aec42 100644
--- a/spec/classes/tripleo_profile_base_heat_engine_spec.rb
+++ b/spec/classes/tripleo_profile_base_heat_engine_spec.rb
@@ -88,7 +88,7 @@ eos
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::heat::engine'
diff --git a/spec/classes/tripleo_profile_base_heat_spec.rb b/spec/classes/tripleo_profile_base_heat_spec.rb
index 66283eab8..490d05ca8 100644
--- a/spec/classes/tripleo_profile_base_heat_spec.rb
+++ b/spec/classes/tripleo_profile_base_heat_spec.rb
@@ -164,7 +164,7 @@ eos
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::heat'
diff --git a/spec/classes/tripleo_profile_base_horizon_spec.rb b/spec/classes/tripleo_profile_base_horizon_spec.rb
index 813125201..6a5da2a0a 100644
--- a/spec/classes/tripleo_profile_base_horizon_spec.rb
+++ b/spec/classes/tripleo_profile_base_horizon_spec.rb
@@ -144,7 +144,7 @@ describe 'tripleo::profile::base::horizon' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::horizon'
diff --git a/spec/classes/tripleo_profile_base_ironic_api_spec.rb b/spec/classes/tripleo_profile_base_ironic_api_spec.rb
index 12e319ba8..8dbba6868 100644
--- a/spec/classes/tripleo_profile_base_ironic_api_spec.rb
+++ b/spec/classes/tripleo_profile_base_ironic_api_spec.rb
@@ -112,7 +112,7 @@ eos
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::ironic::api'
diff --git a/spec/classes/tripleo_profile_base_ironic_authtoken_spec.rb b/spec/classes/tripleo_profile_base_ironic_authtoken_spec.rb
index 16ff3d1d1..1246566d8 100644
--- a/spec/classes/tripleo_profile_base_ironic_authtoken_spec.rb
+++ b/spec/classes/tripleo_profile_base_ironic_authtoken_spec.rb
@@ -61,7 +61,7 @@ describe 'tripleo::profile::base::ironic::authtoken' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::ironic::authtoken'
diff --git a/spec/classes/tripleo_profile_base_ironic_inspector_authtoken_spec.rb b/spec/classes/tripleo_profile_base_ironic_inspector_authtoken_spec.rb
index 5b8c43075..d9b662328 100644
--- a/spec/classes/tripleo_profile_base_ironic_inspector_authtoken_spec.rb
+++ b/spec/classes/tripleo_profile_base_ironic_inspector_authtoken_spec.rb
@@ -61,7 +61,7 @@ describe 'tripleo::profile::base::ironic_inspector::authtoken' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::ironic_inspector::authtoken'
diff --git a/spec/classes/tripleo_profile_base_ironic_inspector_spec.rb b/spec/classes/tripleo_profile_base_ironic_inspector_spec.rb
index 6d59da88e..02d0e167c 100644
--- a/spec/classes/tripleo_profile_base_ironic_inspector_spec.rb
+++ b/spec/classes/tripleo_profile_base_ironic_inspector_spec.rb
@@ -111,7 +111,7 @@ describe 'tripleo::profile::base::ironic_inspector' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::ironic_inspector'
diff --git a/spec/classes/tripleo_profile_base_ironic_spec.rb b/spec/classes/tripleo_profile_base_ironic_spec.rb
index 55417cbee..57b80f312 100644
--- a/spec/classes/tripleo_profile_base_ironic_spec.rb
+++ b/spec/classes/tripleo_profile_base_ironic_spec.rb
@@ -102,7 +102,7 @@ describe 'tripleo::profile::base::ironic' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::ironic'
diff --git a/spec/classes/tripleo_profile_base_iscsid_spec.rb b/spec/classes/tripleo_profile_base_iscsid_spec.rb
index f795a7922..d4f8f2921 100644
--- a/spec/classes/tripleo_profile_base_iscsid_spec.rb
+++ b/spec/classes/tripleo_profile_base_iscsid_spec.rb
@@ -53,7 +53,7 @@ describe 'tripleo::profile::base::iscsid' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::iscsid'
diff --git a/spec/classes/tripleo_profile_base_keystone_spec.rb b/spec/classes/tripleo_profile_base_keystone_spec.rb
index 2233031da..fea9e3e96 100644
--- a/spec/classes/tripleo_profile_base_keystone_spec.rb
+++ b/spec/classes/tripleo_profile_base_keystone_spec.rb
@@ -202,7 +202,7 @@ describe 'tripleo::profile::base::keystone' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::keystone'
diff --git a/spec/classes/tripleo_profile_base_lvm_spec.rb b/spec/classes/tripleo_profile_base_lvm_spec.rb
index a869184fa..6b878192b 100644
--- a/spec/classes/tripleo_profile_base_lvm_spec.rb
+++ b/spec/classes/tripleo_profile_base_lvm_spec.rb
@@ -44,7 +44,7 @@ describe 'tripleo::profile::base::lvm' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::lvm'
diff --git a/spec/classes/tripleo_profile_base_manila_api_spec.rb b/spec/classes/tripleo_profile_base_manila_api_spec.rb
index 8e39f94c0..4f00a9d00 100644
--- a/spec/classes/tripleo_profile_base_manila_api_spec.rb
+++ b/spec/classes/tripleo_profile_base_manila_api_spec.rb
@@ -217,7 +217,7 @@ eos
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::manila::api'
diff --git a/spec/classes/tripleo_profile_base_manila_authtoken_spec.rb b/spec/classes/tripleo_profile_base_manila_authtoken_spec.rb
index e609a2648..e561e0640 100644
--- a/spec/classes/tripleo_profile_base_manila_authtoken_spec.rb
+++ b/spec/classes/tripleo_profile_base_manila_authtoken_spec.rb
@@ -61,7 +61,7 @@ describe 'tripleo::profile::base::manila::authtoken' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::manila::authtoken'
diff --git a/spec/classes/tripleo_profile_base_manila_scheduler_spec.rb b/spec/classes/tripleo_profile_base_manila_scheduler_spec.rb
index a58f8a15d..04ac474ad 100644
--- a/spec/classes/tripleo_profile_base_manila_scheduler_spec.rb
+++ b/spec/classes/tripleo_profile_base_manila_scheduler_spec.rb
@@ -67,7 +67,7 @@ eos
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::manila::scheduler'
diff --git a/spec/classes/tripleo_profile_base_manila_share_spec.rb b/spec/classes/tripleo_profile_base_manila_share_spec.rb
index aaae3e100..560f7ffdd 100644
--- a/spec/classes/tripleo_profile_base_manila_share_spec.rb
+++ b/spec/classes/tripleo_profile_base_manila_share_spec.rb
@@ -69,7 +69,7 @@ eos
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::manila::share'
diff --git a/spec/classes/tripleo_profile_base_manila_spec.rb b/spec/classes/tripleo_profile_base_manila_spec.rb
index 38b04b6a9..95f6b01d5 100644
--- a/spec/classes/tripleo_profile_base_manila_spec.rb
+++ b/spec/classes/tripleo_profile_base_manila_spec.rb
@@ -118,7 +118,7 @@ describe 'tripleo::profile::base::manila' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::manila'
diff --git a/spec/classes/tripleo_profile_base_memcached_spec.rb b/spec/classes/tripleo_profile_base_memcached_spec.rb
index bc58e4efc..b831f4c60 100644
--- a/spec/classes/tripleo_profile_base_memcached_spec.rb
+++ b/spec/classes/tripleo_profile_base_memcached_spec.rb
@@ -67,7 +67,7 @@ describe 'tripleo::profile::base::memcached' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::memcached'
diff --git a/spec/classes/tripleo_profile_base_metrics_qdr_spec.rb b/spec/classes/tripleo_profile_base_metrics_qdr_spec.rb
index 58df1ea75..cbf32d18a 100644
--- a/spec/classes/tripleo_profile_base_metrics_qdr_spec.rb
+++ b/spec/classes/tripleo_profile_base_metrics_qdr_spec.rb
@@ -226,7 +226,7 @@ describe 'tripleo::profile::base::metrics::qdr' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::metrics::qdr'
diff --git a/spec/classes/tripleo_profile_base_neutron_authtoken_spec.rb b/spec/classes/tripleo_profile_base_neutron_authtoken_spec.rb
index 31dfcf071..4d504c27b 100644
--- a/spec/classes/tripleo_profile_base_neutron_authtoken_spec.rb
+++ b/spec/classes/tripleo_profile_base_neutron_authtoken_spec.rb
@@ -61,7 +61,7 @@ describe 'tripleo::profile::base::neutron::authtoken' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::neutron::authtoken'
diff --git a/spec/classes/tripleo_profile_base_neutron_dhcp_spec.rb b/spec/classes/tripleo_profile_base_neutron_dhcp_spec.rb
index ec0d93546..520da57b8 100644
--- a/spec/classes/tripleo_profile_base_neutron_dhcp_spec.rb
+++ b/spec/classes/tripleo_profile_base_neutron_dhcp_spec.rb
@@ -46,7 +46,7 @@ describe 'tripleo::profile::base::neutron::dhcp' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::neutron::dhcp'
diff --git a/spec/classes/tripleo_profile_base_neutron_l3_spec.rb b/spec/classes/tripleo_profile_base_neutron_l3_spec.rb
index fae7fcdba..9c409a9c2 100644
--- a/spec/classes/tripleo_profile_base_neutron_l3_spec.rb
+++ b/spec/classes/tripleo_profile_base_neutron_l3_spec.rb
@@ -46,7 +46,7 @@ describe 'tripleo::profile::base::neutron::l3' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::neutron::l3'
diff --git a/spec/classes/tripleo_profile_base_neutron_ml2_vts_spec.rb b/spec/classes/tripleo_profile_base_neutron_ml2_vts_spec.rb
index 06a3bea38..79b48646b 100644
--- a/spec/classes/tripleo_profile_base_neutron_ml2_vts_spec.rb
+++ b/spec/classes/tripleo_profile_base_neutron_ml2_vts_spec.rb
@@ -89,7 +89,7 @@ describe 'tripleo::profile::base::neutron::plugins::ml2::vts' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::neutron::plugins::ml2::vts'
diff --git a/spec/classes/tripleo_profile_base_neutron_ovs_spec.rb b/spec/classes/tripleo_profile_base_neutron_ovs_spec.rb
index c5ec01f7d..886b37602 100644
--- a/spec/classes/tripleo_profile_base_neutron_ovs_spec.rb
+++ b/spec/classes/tripleo_profile_base_neutron_ovs_spec.rb
@@ -89,7 +89,7 @@ describe 'tripleo::profile::base::neutron::ovs' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::neutron::ovs with default params'
diff --git a/spec/classes/tripleo_profile_base_neutron_server_spec.rb b/spec/classes/tripleo_profile_base_neutron_server_spec.rb
index ea2519c6b..543129e81 100644
--- a/spec/classes/tripleo_profile_base_neutron_server_spec.rb
+++ b/spec/classes/tripleo_profile_base_neutron_server_spec.rb
@@ -208,7 +208,7 @@ eos
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::neutron::server'
diff --git a/spec/classes/tripleo_profile_base_neutron_spec.rb b/spec/classes/tripleo_profile_base_neutron_spec.rb
index a6735aeb1..b0b1533ac 100644
--- a/spec/classes/tripleo_profile_base_neutron_spec.rb
+++ b/spec/classes/tripleo_profile_base_neutron_spec.rb
@@ -90,7 +90,7 @@ describe 'tripleo::profile::base::neutron' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::neutron'
diff --git a/spec/classes/tripleo_profile_base_nova_api_spec.rb b/spec/classes/tripleo_profile_base_nova_api_spec.rb
index 03ab98a2f..781f194be 100644
--- a/spec/classes/tripleo_profile_base_nova_api_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_api_spec.rb
@@ -174,7 +174,7 @@ eos
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::nova::api'
diff --git a/spec/classes/tripleo_profile_base_nova_authtoken_spec.rb b/spec/classes/tripleo_profile_base_nova_authtoken_spec.rb
index 3bc1f66f0..90ce6864f 100644
--- a/spec/classes/tripleo_profile_base_nova_authtoken_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_authtoken_spec.rb
@@ -61,7 +61,7 @@ describe 'tripleo::profile::base::nova::authtoken' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::nova::authtoken'
diff --git a/spec/classes/tripleo_profile_base_nova_compute_ironic_spec.rb b/spec/classes/tripleo_profile_base_nova_compute_ironic_spec.rb
index 10ad36896..f09a8cdae 100644
--- a/spec/classes/tripleo_profile_base_nova_compute_ironic_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_compute_ironic_spec.rb
@@ -58,7 +58,7 @@ eos
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::nova::compute::ironic'
diff --git a/spec/classes/tripleo_profile_base_nova_compute_libvirt_spec.rb b/spec/classes/tripleo_profile_base_nova_compute_libvirt_spec.rb
index 9e1404665..5096f9a1e 100644
--- a/spec/classes/tripleo_profile_base_nova_compute_libvirt_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_compute_libvirt_spec.rb
@@ -77,7 +77,7 @@ eos
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::nova::compute::libvirt'
diff --git a/spec/classes/tripleo_profile_base_nova_compute_spec.rb b/spec/classes/tripleo_profile_base_nova_compute_spec.rb
index 840477fc8..95544ae0b 100644
--- a/spec/classes/tripleo_profile_base_nova_compute_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_compute_spec.rb
@@ -111,7 +111,7 @@ eos
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::nova::compute'
diff --git a/spec/classes/tripleo_profile_base_nova_conductor_spec.rb b/spec/classes/tripleo_profile_base_nova_conductor_spec.rb
index b9727b805..47950be96 100644
--- a/spec/classes/tripleo_profile_base_nova_conductor_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_conductor_spec.rb
@@ -54,7 +54,7 @@ eos
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::nova::conductor'
diff --git a/spec/classes/tripleo_profile_base_nova_libvirt_spec.rb b/spec/classes/tripleo_profile_base_nova_libvirt_spec.rb
index 36dc69e52..3395a9686 100644
--- a/spec/classes/tripleo_profile_base_nova_libvirt_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_libvirt_spec.rb
@@ -248,7 +248,7 @@ eos
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::nova::libvirt'
diff --git a/spec/classes/tripleo_profile_base_nova_metadata_spec.rb b/spec/classes/tripleo_profile_base_nova_metadata_spec.rb
index aed31f476..f0388e4ee 100644
--- a/spec/classes/tripleo_profile_base_nova_metadata_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_metadata_spec.rb
@@ -160,7 +160,7 @@ eos
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::nova::metadata'
diff --git a/spec/classes/tripleo_profile_base_nova_migration_client_spec.rb b/spec/classes/tripleo_profile_base_nova_migration_client_spec.rb
index fa64e612c..a444524d5 100644
--- a/spec/classes/tripleo_profile_base_nova_migration_client_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_migration_client_spec.rb
@@ -182,7 +182,7 @@ eos
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
       it_behaves_like 'tripleo::profile::base::nova::migration::client'
     end
diff --git a/spec/classes/tripleo_profile_base_nova_migration_proxy_spec.rb b/spec/classes/tripleo_profile_base_nova_migration_proxy_spec.rb
index 20c7c7331..95b823c95 100644
--- a/spec/classes/tripleo_profile_base_nova_migration_proxy_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_migration_proxy_spec.rb
@@ -95,7 +95,7 @@ eos
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
       it_behaves_like 'tripleo::profile::base::nova::migration::proxy'
     end
diff --git a/spec/classes/tripleo_profile_base_nova_migration_target_spec.rb b/spec/classes/tripleo_profile_base_nova_migration_target_spec.rb
index 0d7cd3861..ede2676ca 100644
--- a/spec/classes/tripleo_profile_base_nova_migration_target_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_migration_target_spec.rb
@@ -324,7 +324,7 @@ eos
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
       it_behaves_like 'tripleo::profile::base::nova::migration::target'
     end
diff --git a/spec/classes/tripleo_profile_base_nova_scheduler_spec.rb b/spec/classes/tripleo_profile_base_nova_scheduler_spec.rb
index f4fd92614..a784244c0 100644
--- a/spec/classes/tripleo_profile_base_nova_scheduler_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_scheduler_spec.rb
@@ -55,7 +55,7 @@ eos
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::nova::scheduler'
diff --git a/spec/classes/tripleo_profile_base_nova_spec.rb b/spec/classes/tripleo_profile_base_nova_spec.rb
index 6d35800f5..1caaa8d07 100644
--- a/spec/classes/tripleo_profile_base_nova_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_spec.rb
@@ -121,7 +121,7 @@ describe 'tripleo::profile::base::nova' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::nova'
diff --git a/spec/classes/tripleo_profile_base_nova_vncproxy_spec.rb b/spec/classes/tripleo_profile_base_nova_vncproxy_spec.rb
index 4a684dc75..24a953f45 100644
--- a/spec/classes/tripleo_profile_base_nova_vncproxy_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_vncproxy_spec.rb
@@ -53,7 +53,7 @@ eos
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::nova::vncproxy'
diff --git a/spec/classes/tripleo_profile_base_novajoin_authtoken_spec.rb b/spec/classes/tripleo_profile_base_novajoin_authtoken_spec.rb
index b9581423a..59324d7d8 100644
--- a/spec/classes/tripleo_profile_base_novajoin_authtoken_spec.rb
+++ b/spec/classes/tripleo_profile_base_novajoin_authtoken_spec.rb
@@ -61,7 +61,7 @@ describe 'tripleo::profile::base::novajoin::authtoken' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::novajoin::authtoken'
diff --git a/spec/classes/tripleo_profile_base_novajoin_spec.rb b/spec/classes/tripleo_profile_base_novajoin_spec.rb
index 8b9c33889..58040eeaf 100644
--- a/spec/classes/tripleo_profile_base_novajoin_spec.rb
+++ b/spec/classes/tripleo_profile_base_novajoin_spec.rb
@@ -122,7 +122,7 @@ eos
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({})
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
       it_behaves_like 'tripleo::profile::base::novajoin'
     end
diff --git a/spec/classes/tripleo_profile_base_octavia_api_spec.rb b/spec/classes/tripleo_profile_base_octavia_api_spec.rb
index 602fa351f..5372520f1 100644
--- a/spec/classes/tripleo_profile_base_octavia_api_spec.rb
+++ b/spec/classes/tripleo_profile_base_octavia_api_spec.rb
@@ -173,7 +173,7 @@ eos
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
       it_behaves_like 'tripleo::profile::base::octavia::api'
     end
diff --git a/spec/classes/tripleo_profile_base_octavia_authtoken_spec.rb b/spec/classes/tripleo_profile_base_octavia_authtoken_spec.rb
index a5b490912..35459a52e 100644
--- a/spec/classes/tripleo_profile_base_octavia_authtoken_spec.rb
+++ b/spec/classes/tripleo_profile_base_octavia_authtoken_spec.rb
@@ -61,7 +61,7 @@ describe 'tripleo::profile::base::octavia::authtoken' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::octavia::authtoken'
diff --git a/spec/classes/tripleo_profile_base_octavia_health_manager_spec.rb b/spec/classes/tripleo_profile_base_octavia_health_manager_spec.rb
index fc5146af5..36779a1ff 100644
--- a/spec/classes/tripleo_profile_base_octavia_health_manager_spec.rb
+++ b/spec/classes/tripleo_profile_base_octavia_health_manager_spec.rb
@@ -75,7 +75,7 @@ eos
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({})
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
       it_behaves_like 'tripleo::profile::base::octavia::health_manager'
     end
diff --git a/spec/classes/tripleo_profile_base_octavia_housekeeping_spec.rb b/spec/classes/tripleo_profile_base_octavia_housekeeping_spec.rb
index bda852427..29c7c2eb9 100644
--- a/spec/classes/tripleo_profile_base_octavia_housekeeping_spec.rb
+++ b/spec/classes/tripleo_profile_base_octavia_housekeeping_spec.rb
@@ -75,7 +75,7 @@ eos
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({})
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
       it_behaves_like 'tripleo::profile::base::octavia::housekeeping'
     end
diff --git a/spec/classes/tripleo_profile_base_octavia_provider_ovn_spec.rb b/spec/classes/tripleo_profile_base_octavia_provider_ovn_spec.rb
index 87f3d50ad..aa647eded 100644
--- a/spec/classes/tripleo_profile_base_octavia_provider_ovn_spec.rb
+++ b/spec/classes/tripleo_profile_base_octavia_provider_ovn_spec.rb
@@ -129,7 +129,7 @@ eos
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
       it_behaves_like 'tripleo::profile::base::octavia::provider::ovn'
     end
diff --git a/spec/classes/tripleo_profile_base_octavia_spec.rb b/spec/classes/tripleo_profile_base_octavia_spec.rb
index 40aa8ac19..0ded369b5 100644
--- a/spec/classes/tripleo_profile_base_octavia_spec.rb
+++ b/spec/classes/tripleo_profile_base_octavia_spec.rb
@@ -146,7 +146,7 @@ describe 'tripleo::profile::base::octavia' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({})
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
       it_behaves_like 'tripleo::profile::base::octavia'
     end
diff --git a/spec/classes/tripleo_profile_base_octavia_worker_spec.rb b/spec/classes/tripleo_profile_base_octavia_worker_spec.rb
index d7ece7540..e53c7bbb4 100644
--- a/spec/classes/tripleo_profile_base_octavia_worker_spec.rb
+++ b/spec/classes/tripleo_profile_base_octavia_worker_spec.rb
@@ -75,7 +75,7 @@ eos
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({})
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
       it_behaves_like 'tripleo::profile::base::octavia::worker'
     end
diff --git a/spec/classes/tripleo_profile_base_pacemaker_spec.rb b/spec/classes/tripleo_profile_base_pacemaker_spec.rb
index 49551da4c..8fb5ba028 100644
--- a/spec/classes/tripleo_profile_base_pacemaker_spec.rb
+++ b/spec/classes/tripleo_profile_base_pacemaker_spec.rb
@@ -62,7 +62,7 @@ describe 'tripleo::profile::base::pacemaker' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::pacemaker'
diff --git a/spec/classes/tripleo_profile_base_placement_api_spec.rb b/spec/classes/tripleo_profile_base_placement_api_spec.rb
index 05d329b2c..ed2599ff1 100644
--- a/spec/classes/tripleo_profile_base_placement_api_spec.rb
+++ b/spec/classes/tripleo_profile_base_placement_api_spec.rb
@@ -122,7 +122,7 @@ eos
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::placement::api'
diff --git a/spec/classes/tripleo_profile_base_placement_authtoken_spec.rb b/spec/classes/tripleo_profile_base_placement_authtoken_spec.rb
index 1c4e04301..ae3a0db5a 100644
--- a/spec/classes/tripleo_profile_base_placement_authtoken_spec.rb
+++ b/spec/classes/tripleo_profile_base_placement_authtoken_spec.rb
@@ -61,7 +61,7 @@ describe 'tripleo::profile::base::placement::authtoken' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::placement::authtoken'
diff --git a/spec/classes/tripleo_profile_base_placement_spec.rb b/spec/classes/tripleo_profile_base_placement_spec.rb
index e12e5486b..74a05ffb5 100644
--- a/spec/classes/tripleo_profile_base_placement_spec.rb
+++ b/spec/classes/tripleo_profile_base_placement_spec.rb
@@ -84,7 +84,7 @@ describe 'tripleo::profile::base::placement' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::placement'
diff --git a/spec/classes/tripleo_profile_base_qdr_spec.rb b/spec/classes/tripleo_profile_base_qdr_spec.rb
index bffe87e52..df6befce5 100644
--- a/spec/classes/tripleo_profile_base_qdr_spec.rb
+++ b/spec/classes/tripleo_profile_base_qdr_spec.rb
@@ -149,7 +149,7 @@ describe 'tripleo::profile::base::qdr' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::qdr'
diff --git a/spec/classes/tripleo_profile_base_swift_proxy_spec.rb b/spec/classes/tripleo_profile_base_swift_proxy_spec.rb
index 1c3a1234d..1e801a5ac 100644
--- a/spec/classes/tripleo_profile_base_swift_proxy_spec.rb
+++ b/spec/classes/tripleo_profile_base_swift_proxy_spec.rb
@@ -129,7 +129,7 @@ describe 'tripleo::profile::base::swift::proxy' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({})
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::swift::proxy'
diff --git a/spec/classes/tripleo_profile_base_swift_ringbuilder_spec.rb b/spec/classes/tripleo_profile_base_swift_ringbuilder_spec.rb
index 69f58bc1b..e559f54e2 100644
--- a/spec/classes/tripleo_profile_base_swift_ringbuilder_spec.rb
+++ b/spec/classes/tripleo_profile_base_swift_ringbuilder_spec.rb
@@ -56,7 +56,7 @@ describe 'tripleo::profile::base::swift::ringbuilder' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({})
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::swift::ringbuilder'
diff --git a/spec/classes/tripleo_profile_base_swift_spec.rb b/spec/classes/tripleo_profile_base_swift_spec.rb
index 48090b5b3..e5e0b2ffa 100644
--- a/spec/classes/tripleo_profile_base_swift_spec.rb
+++ b/spec/classes/tripleo_profile_base_swift_spec.rb
@@ -77,7 +77,7 @@ describe 'tripleo::profile::base::swift' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({})
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::swift'
diff --git a/spec/classes/tripleo_profile_pacemaker_cinder_backup_bundle_spec.rb b/spec/classes/tripleo_profile_pacemaker_cinder_backup_bundle_spec.rb
index 57f2c6ee3..addd75c09 100644
--- a/spec/classes/tripleo_profile_pacemaker_cinder_backup_bundle_spec.rb
+++ b/spec/classes/tripleo_profile_pacemaker_cinder_backup_bundle_spec.rb
@@ -115,7 +115,7 @@ describe 'tripleo::profile::pacemaker::cinder::backup_bundle' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::pacemaker::cinder::backup_bundle'
diff --git a/spec/classes/tripleo_profile_pacemaker_cinder_volume_bundle_spec.rb b/spec/classes/tripleo_profile_pacemaker_cinder_volume_bundle_spec.rb
index aa610bc51..9a47dfdb8 100644
--- a/spec/classes/tripleo_profile_pacemaker_cinder_volume_bundle_spec.rb
+++ b/spec/classes/tripleo_profile_pacemaker_cinder_volume_bundle_spec.rb
@@ -121,7 +121,7 @@ describe 'tripleo::profile::pacemaker::cinder::volume_bundle' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::pacemaker::cinder::volume_bundle'
diff --git a/spec/classes/tripleo_profile_pacemaker_manila_share_bundle_spec.rb b/spec/classes/tripleo_profile_pacemaker_manila_share_bundle_spec.rb
index deebd33a5..bc82d2016 100644
--- a/spec/classes/tripleo_profile_pacemaker_manila_share_bundle_spec.rb
+++ b/spec/classes/tripleo_profile_pacemaker_manila_share_bundle_spec.rb
@@ -134,7 +134,7 @@ describe 'tripleo::profile::pacemaker::manila::share_bundle' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::pacemaker::manila::share_bundle'
diff --git a/spec/defines/tripleo_firewall_service_rules_spec.rb b/spec/defines/tripleo_firewall_service_rules_spec.rb
index bacb6d9a0..540ccf2c4 100644
--- a/spec/defines/tripleo_firewall_service_rules_spec.rb
+++ b/spec/defines/tripleo_firewall_service_rules_spec.rb
@@ -28,7 +28,7 @@ describe 'tripleo::firewall::service_rules' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({})
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo firewall service rules'
diff --git a/spec/defines/tripleo_haproxy_endpoint_spec.rb b/spec/defines/tripleo_haproxy_endpoint_spec.rb
index 6e12fb76f..3c04fa79f 100644
--- a/spec/defines/tripleo_haproxy_endpoint_spec.rb
+++ b/spec/defines/tripleo_haproxy_endpoint_spec.rb
@@ -105,7 +105,7 @@ describe 'tripleo::haproxy::endpoint' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({})
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo haproxy endpoint'
diff --git a/spec/defines/tripleo_haproxy_service_endpoints_spec.rb b/spec/defines/tripleo_haproxy_service_endpoints_spec.rb
index b5d6863be..c8cb970fe 100644
--- a/spec/defines/tripleo_haproxy_service_endpoints_spec.rb
+++ b/spec/defines/tripleo_haproxy_service_endpoints_spec.rb
@@ -40,7 +40,7 @@ describe 'tripleo::haproxy::service_endpoints' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({})
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo haproxy service_endpoints'
diff --git a/spec/defines/tripleo_haproxy_userlist_spec.rb b/spec/defines/tripleo_haproxy_userlist_spec.rb
index 122869b2c..c68ecad8f 100644
--- a/spec/defines/tripleo_haproxy_userlist_spec.rb
+++ b/spec/defines/tripleo_haproxy_userlist_spec.rb
@@ -47,7 +47,7 @@ describe 'tripleo::haproxy::userlist' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({})
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo haproxy userlist'
diff --git a/spec/defines/tripleo_profile_base_database_mysql_user_spec.rb b/spec/defines/tripleo_profile_base_database_mysql_user_spec.rb
index c215f7ac1..4a7731346 100644
--- a/spec/defines/tripleo_profile_base_database_mysql_user_spec.rb
+++ b/spec/defines/tripleo_profile_base_database_mysql_user_spec.rb
@@ -34,7 +34,7 @@ describe 'tripleo::profile::base::database::mysql::user' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({})
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo  profile  base  database  mysql  user'
diff --git a/spec/defines/tripleo_profile_base_logging_rsyslog_file_input_spec.rb b/spec/defines/tripleo_profile_base_logging_rsyslog_file_input_spec.rb
index 04d5bfe3d..8c63034af 100644
--- a/spec/defines/tripleo_profile_base_logging_rsyslog_file_input_spec.rb
+++ b/spec/defines/tripleo_profile_base_logging_rsyslog_file_input_spec.rb
@@ -69,7 +69,7 @@ EOS
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({})
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::logging::rsyslog::file_input'
diff --git a/spec/defines/tripleo_profile_base_metrics_collectd_sensubility_script_spec.rb b/spec/defines/tripleo_profile_base_metrics_collectd_sensubility_script_spec.rb
index 554b4f508..1c62f3954 100644
--- a/spec/defines/tripleo_profile_base_metrics_collectd_sensubility_script_spec.rb
+++ b/spec/defines/tripleo_profile_base_metrics_collectd_sensubility_script_spec.rb
@@ -36,7 +36,7 @@ describe 'tripleo::profile::base::metrics::collectd::sensubility_script' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({})
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::metrics::collectd::sensubility_script'
diff --git a/spec/defines/tripleo_profile_base_neutron_wrappers_dibbler_client_spec.rb b/spec/defines/tripleo_profile_base_neutron_wrappers_dibbler_client_spec.rb
index 9974a08ff..0b37781d9 100644
--- a/spec/defines/tripleo_profile_base_neutron_wrappers_dibbler_client_spec.rb
+++ b/spec/defines/tripleo_profile_base_neutron_wrappers_dibbler_client_spec.rb
@@ -79,7 +79,7 @@ describe 'tripleo::profile::base::neutron::wrappers::dibbler_client' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::neutron::wrappers::dibbler_client'
diff --git a/spec/defines/tripleo_profile_base_neutron_wrappers_dnsmasq_spec.rb b/spec/defines/tripleo_profile_base_neutron_wrappers_dnsmasq_spec.rb
index d9b5942d6..bc94773ca 100644
--- a/spec/defines/tripleo_profile_base_neutron_wrappers_dnsmasq_spec.rb
+++ b/spec/defines/tripleo_profile_base_neutron_wrappers_dnsmasq_spec.rb
@@ -81,7 +81,7 @@ describe 'tripleo::profile::base::neutron::wrappers::dnsmasq' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::neutron::wrappers::dnsmasq'
diff --git a/spec/defines/tripleo_profile_base_neutron_wrappers_haproxy_spec.rb b/spec/defines/tripleo_profile_base_neutron_wrappers_haproxy_spec.rb
index 817e11159..813178113 100644
--- a/spec/defines/tripleo_profile_base_neutron_wrappers_haproxy_spec.rb
+++ b/spec/defines/tripleo_profile_base_neutron_wrappers_haproxy_spec.rb
@@ -87,7 +87,7 @@ describe 'tripleo::profile::base::neutron::wrappers::haproxy' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::neutron::wrappers::haproxy'
diff --git a/spec/defines/tripleo_profile_base_neutron_wrappers_keepalived_spec.rb b/spec/defines/tripleo_profile_base_neutron_wrappers_keepalived_spec.rb
index 6727c7906..3283d6291 100644
--- a/spec/defines/tripleo_profile_base_neutron_wrappers_keepalived_spec.rb
+++ b/spec/defines/tripleo_profile_base_neutron_wrappers_keepalived_spec.rb
@@ -81,7 +81,7 @@ describe 'tripleo::profile::base::neutron::wrappers::keepalived' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::neutron::wrappers::keepalived'
diff --git a/spec/defines/tripleo_profile_base_neutron_wrappers_keepalived_state_change_spec.rb b/spec/defines/tripleo_profile_base_neutron_wrappers_keepalived_state_change_spec.rb
index 1af7dcfd5..8d39cd80a 100644
--- a/spec/defines/tripleo_profile_base_neutron_wrappers_keepalived_state_change_spec.rb
+++ b/spec/defines/tripleo_profile_base_neutron_wrappers_keepalived_state_change_spec.rb
@@ -73,7 +73,7 @@ describe 'tripleo::profile::base::neutron::wrappers::keepalived_state_change' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::neutron::wrappers::keepalived_state_change'
diff --git a/spec/defines/tripleo_profile_base_neutron_wrappers_radvd_spec.rb b/spec/defines/tripleo_profile_base_neutron_wrappers_radvd_spec.rb
index 155abb5aa..f7029a2af 100644
--- a/spec/defines/tripleo_profile_base_neutron_wrappers_radvd_spec.rb
+++ b/spec/defines/tripleo_profile_base_neutron_wrappers_radvd_spec.rb
@@ -87,7 +87,7 @@ describe 'tripleo::profile::base::neutron::wrappers::radvd' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({ :hostname => 'node.example.com' })
+        facts.merge(OSDefaults.get_facts({ :hostname => 'node.example.com' }))
       end
 
       it_behaves_like 'tripleo::profile::base::neutron::wrappers::radvd'