Add test for legacy domain fact & Add/correct legacy domain fact

facts/1.6/amazon-2017-x86_64.facts

@@ -3,7 +3,7 @@
   "architecture": "x86_64",
   "kernel": "Linux",
   "augeasversion": "1.4.0",
-  "domain": "us-gov-west-1.compute.internal",
+  "domain": "example.com",
   "macaddress": "02:85:E9:60:90:D4",
   "operatingsystem": "Amazon",
   "facterversion": "1.6.18",

facts/1.6/ubuntu-18.04-aarch64.facts

@@ -1 +1 @@
-{"fqdn": "foo.example.com","gem_version":"~> 1.6.0","architecture":"aarch64","kernel":"Linux","augeasversion":"1.10.1","macaddress":"0e:4d:7e:1d:ba:93","facterversion":"1.6.18","hardwareisa":"aarch64","hardwaremodel":"aarch64","hostname":"foo","id":"pi","interfaces":"datapath,docker0,eth0,lo,vethwe_bridge,vethwe_datapath,vethwepl1190438,vethwepl45061de,vxlan_6784,weave","macaddress_datapath":"0e:4d:7e:1d:ba:93","macaddress_docker0":"02:42:b2:a3:3e:6e","macaddress_eth0":"00:1e:06:36:82:50","macaddress_vethwe_bridge":"9e:05:83:01:88:19","macaddress_vethwe_datapath":"5a:78:67:28:0e:bf","macaddress_vethwepl1190438":"f6:84:b6:6c:50:e5","macaddress_vethwepl45061de":"da:a8:a2:71:87:c5","macaddress_vxlan_6784":"1e:04:e7:91:ea:97","macaddress_weave":"9a:7c:ff:7c:17:5a","ipaddress":"172.17.0.1","kernelmajversion":"4.19","kernelrelease":"4.19.20-meson64","kernelversion":"4.19.20","lsbdistcodename":"bionic","lsbdistdescription":"Ubuntu 18.04.2 LTS","lsbdistid":"Ubuntu","lsbdistrelease":"18.04","lsbmajdistrelease":"18","memorysize":"1.93 GB","memoryfree":"630.89 MB","swapsize":"0.00 kB","swapfree":"0.00 kB","memorytotal":"1.93 GB","operatingsystem":"Ubuntu","operatingsystemrelease":"18.04","osfamily":"Debian","path":"/var/lib/gems/2.5.0/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games","physicalprocessorcount":1,"processorcount":"4","ps":"ps -ef","puppetversion":"5.4.0","rubysitedir":"/usr/local/lib/site_ruby/2.5.0","rubyversion":"2.5.1","selinux":"false","sshrsakey":"AAAAB3NzaC1yc2EAAAADAQABAAABAQDNfqIh9u1n6hnzc/m9UBY+x3WPYJ6oEQE6CwgVPuL0F0ZPnl8U+NsUGwezYnszdGyyw08NNrxDBW881+rrXtFFpbd8Owl0/AcEVAr1iCPbP5v/jZ7VYkXJJiEqiupSPfmkhbuCWviYqK4VFhiKyhnRrkojnzfCZrSDh0BpZj+jGZTV4bPvxF9iCq2e4ySNt4Icmw0//pMDrvCYqPqeuJT5svG7ULTkIqWBh2p2/Nihe+AQZ2GfwbnrQlfDED83i6a8igdux3C7ERhP05N4IXdKcWXR23a6rfo/f+tAMQqGxpo5m6PwLjyOpbYXpkkU/gNrS7u4IoVq8IN8u1MsgI5P","sshecdsakey":"AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBD315RI/2z56nPdxYxXmGHuZmxEPcScc5Mna4+5j1T4L5LJ27886y6l+g04keuaJZJnMN3UTU04zw8vwqgt2x4k=","timezone":"UTC","uniqueid":"a8c00501","uptime":"1 day","uptime_days":1,"uptime_hours":27,"uptime_seconds":99678,"virtual":"physical","is_virtual":"false"}
+{"domain": "example.com", "fqdn": "foo.example.com","gem_version":"~> 1.6.0","architecture":"aarch64","kernel":"Linux","augeasversion":"1.10.1","macaddress":"0e:4d:7e:1d:ba:93","facterversion":"1.6.18","hardwareisa":"aarch64","hardwaremodel":"aarch64","hostname":"foo","id":"pi","interfaces":"datapath,docker0,eth0,lo,vethwe_bridge,vethwe_datapath,vethwepl1190438,vethwepl45061de,vxlan_6784,weave","macaddress_datapath":"0e:4d:7e:1d:ba:93","macaddress_docker0":"02:42:b2:a3:3e:6e","macaddress_eth0":"00:1e:06:36:82:50","macaddress_vethwe_bridge":"9e:05:83:01:88:19","macaddress_vethwe_datapath":"5a:78:67:28:0e:bf","macaddress_vethwepl1190438":"f6:84:b6:6c:50:e5","macaddress_vethwepl45061de":"da:a8:a2:71:87:c5","macaddress_vxlan_6784":"1e:04:e7:91:ea:97","macaddress_weave":"9a:7c:ff:7c:17:5a","ipaddress":"172.17.0.1","kernelmajversion":"4.19","kernelrelease":"4.19.20-meson64","kernelversion":"4.19.20","lsbdistcodename":"bionic","lsbdistdescription":"Ubuntu 18.04.2 LTS","lsbdistid":"Ubuntu","lsbdistrelease":"18.04","lsbmajdistrelease":"18","memorysize":"1.93 GB","memoryfree":"630.89 MB","swapsize":"0.00 kB","swapfree":"0.00 kB","memorytotal":"1.93 GB","operatingsystem":"Ubuntu","operatingsystemrelease":"18.04","osfamily":"Debian","path":"/var/lib/gems/2.5.0/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games","physicalprocessorcount":1,"processorcount":"4","ps":"ps -ef","puppetversion":"5.4.0","rubysitedir":"/usr/local/lib/site_ruby/2.5.0","rubyversion":"2.5.1","selinux":"false","sshrsakey":"AAAAB3NzaC1yc2EAAAADAQABAAABAQDNfqIh9u1n6hnzc/m9UBY+x3WPYJ6oEQE6CwgVPuL0F0ZPnl8U+NsUGwezYnszdGyyw08NNrxDBW881+rrXtFFpbd8Owl0/AcEVAr1iCPbP5v/jZ7VYkXJJiEqiupSPfmkhbuCWviYqK4VFhiKyhnRrkojnzfCZrSDh0BpZj+jGZTV4bPvxF9iCq2e4ySNt4Icmw0//pMDrvCYqPqeuJT5svG7ULTkIqWBh2p2/Nihe+AQZ2GfwbnrQlfDED83i6a8igdux3C7ERhP05N4IXdKcWXR23a6rfo/f+tAMQqGxpo5m6PwLjyOpbYXpkkU/gNrS7u4IoVq8IN8u1MsgI5P","sshecdsakey":"AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBD315RI/2z56nPdxYxXmGHuZmxEPcScc5Mna4+5j1T4L5LJ27886y6l+g04keuaJZJnMN3UTU04zw8vwqgt2x4k=","timezone":"UTC","uniqueid":"a8c00501","uptime":"1 day","uptime_days":1,"uptime_hours":27,"uptime_seconds":99678,"virtual":"physical","is_virtual":"false"}

facts/1.7/amazon-2017-x86_64.facts

@@ -5,7 +5,7 @@
   "kernel": "Linux",
   "blockdevice_xvda_size": 8589934592,
   "blockdevices": "xvda",
-  "domain": "us-gov-west-1.compute.internal",
+  "domain": "example.com",
   "macaddress": "02:85:E9:60:90:D4",
   "osfamily": "RedHat",
   "operatingsystem": "Amazon",

facts/1.7/ubuntu-18.04-aarch64.facts

@@ -1 +1 @@
-{"fqdn": "foo.example.com","gem_version":"~> 1.7.0","architecture":"aarch64","augeasversion":"1.10.1","kernel":"Linux","blockdevice_mmcblk1_size":32010928128,"blockdevices":"mmcblk1","macaddress":"0e:4d:7e:1d:ba:93","osfamily":"Debian","operatingsystem":"Ubuntu","lsbdistid":"Ubuntu","facterversion":"1.7.6","filesystems":"btrfs,ext2,ext3,ext4,f2fs,iso9660,jfs,msdos,udf,vfat,xfs","hardwareisa":"aarch64","hardwaremodel":"aarch64","hostname":"foo","id":"pi","interfaces":"datapath,docker0,eth0,lo,vethwe_bridge,vethwe_datapath,vethwepl1190438,vethwepl45061de,vxlan_6784,weave","macaddress_datapath":"0e:4d:7e:1d:ba:93","ipaddress_docker0":"172.17.0.1","macaddress_docker0":"02:42:b2:a3:3e:6e","netmask_docker0":"255.255.0.0","ipaddress_eth0":"192.168.1.5","macaddress_eth0":"00:1e:06:36:82:50","netmask_eth0":"255.255.255.0","ipaddress_lo":"127.0.0.1","netmask_lo":"255.0.0.0","macaddress_vethwe_bridge":"9e:05:83:01:88:19","macaddress_vethwe_datapath":"5a:78:67:28:0e:bf","macaddress_vethwepl1190438":"f6:84:b6:6c:50:e5","macaddress_vethwepl45061de":"da:a8:a2:71:87:c5","macaddress_vxlan_6784":"1e:04:e7:91:ea:97","ipaddress_weave":"172.24.0.1","macaddress_weave":"9a:7c:ff:7c:17:5a","netmask_weave":"255.252.0.0","ipaddress":"172.17.0.1","kernelmajversion":"4.19","kernelrelease":"4.19.20-meson64","kernelversion":"4.19.20","lsbdistcodename":"bionic","lsbdistdescription":"Ubuntu 18.04.2 LTS","lsbdistrelease":"18.04","lsbmajdistrelease":"18","memorysize":"1.93 GB","memoryfree":"624.57 MB","swapsize":"0.00 MB","swapfree":"0.00 MB","swapsize_mb":"0.00","swapfree_mb":"0.00","memorysize_mb":"1976.34","memoryfree_mb":"624.57","memorytotal":"1.93 GB","netmask":"255.255.0.0","network_docker0":"172.17.0.0","network_eth0":"192.168.1.0","network_lo":"127.0.0.0","network_weave":"172.24.0.0","operatingsystemrelease":"18.04","path":"/var/lib/gems/2.5.0/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games","physicalprocessorcount":1,"processorcount":"4","ps":"ps -ef","puppetversion":"5.4.0","rubysitedir":"/usr/local/lib/site_ruby/2.5.0","rubyversion":"2.5.1","selinux":"false","sshrsakey":"AAAAB3NzaC1yc2EAAAADAQABAAABAQDNfqIh9u1n6hnzc/m9UBY+x3WPYJ6oEQE6CwgVPuL0F0ZPnl8U+NsUGwezYnszdGyyw08NNrxDBW881+rrXtFFpbd8Owl0/AcEVAr1iCPbP5v/jZ7VYkXJJiEqiupSPfmkhbuCWviYqK4VFhiKyhnRrkojnzfCZrSDh0BpZj+jGZTV4bPvxF9iCq2e4ySNt4Icmw0//pMDrvCYqPqeuJT5svG7ULTkIqWBh2p2/Nihe+AQZ2GfwbnrQlfDED83i6a8igdux3C7ERhP05N4IXdKcWXR23a6rfo/f+tAMQqGxpo5m6PwLjyOpbYXpkkU/gNrS7u4IoVq8IN8u1MsgI5P","sshfp_rsa":"SSHFP 1 1 24b84ae09b7f8db80ed93ca2fb83d3702f43746a\nSSHFP 1 2 74bf878c7bbfcf1b60dc2811a0d6564476f975e6370e87fb03f43a26034761e7","sshecdsakey":"AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBD315RI/2z56nPdxYxXmGHuZmxEPcScc5Mna4+5j1T4L5LJ27886y6l+g04keuaJZJnMN3UTU04zw8vwqgt2x4k=","sshfp_ecdsa":"SSHFP 3 1 6eb842eea4719e00d2227b466a09e5e2289d9e73\nSSHFP 3 2 dc8b86430645fd7cfe394d666a866cde400cfcb3c0ef38ddf931d6998be86528","timezone":"UTC","uniqueid":"a8c00501","uptime":"1 day","uptime_days":1,"uptime_hours":27,"uptime_seconds":99702,"virtual":"physical","is_virtual":"false"}
+{"domain": "example.com", "fqdn": "foo.example.com","gem_version":"~> 1.7.0","architecture":"aarch64","augeasversion":"1.10.1","kernel":"Linux","blockdevice_mmcblk1_size":32010928128,"blockdevices":"mmcblk1","macaddress":"0e:4d:7e:1d:ba:93","osfamily":"Debian","operatingsystem":"Ubuntu","lsbdistid":"Ubuntu","facterversion":"1.7.6","filesystems":"btrfs,ext2,ext3,ext4,f2fs,iso9660,jfs,msdos,udf,vfat,xfs","hardwareisa":"aarch64","hardwaremodel":"aarch64","hostname":"foo","id":"pi","interfaces":"datapath,docker0,eth0,lo,vethwe_bridge,vethwe_datapath,vethwepl1190438,vethwepl45061de,vxlan_6784,weave","macaddress_datapath":"0e:4d:7e:1d:ba:93","ipaddress_docker0":"172.17.0.1","macaddress_docker0":"02:42:b2:a3:3e:6e","netmask_docker0":"255.255.0.0","ipaddress_eth0":"192.168.1.5","macaddress_eth0":"00:1e:06:36:82:50","netmask_eth0":"255.255.255.0","ipaddress_lo":"127.0.0.1","netmask_lo":"255.0.0.0","macaddress_vethwe_bridge":"9e:05:83:01:88:19","macaddress_vethwe_datapath":"5a:78:67:28:0e:bf","macaddress_vethwepl1190438":"f6:84:b6:6c:50:e5","macaddress_vethwepl45061de":"da:a8:a2:71:87:c5","macaddress_vxlan_6784":"1e:04:e7:91:ea:97","ipaddress_weave":"172.24.0.1","macaddress_weave":"9a:7c:ff:7c:17:5a","netmask_weave":"255.252.0.0","ipaddress":"172.17.0.1","kernelmajversion":"4.19","kernelrelease":"4.19.20-meson64","kernelversion":"4.19.20","lsbdistcodename":"bionic","lsbdistdescription":"Ubuntu 18.04.2 LTS","lsbdistrelease":"18.04","lsbmajdistrelease":"18","memorysize":"1.93 GB","memoryfree":"624.57 MB","swapsize":"0.00 MB","swapfree":"0.00 MB","swapsize_mb":"0.00","swapfree_mb":"0.00","memorysize_mb":"1976.34","memoryfree_mb":"624.57","memorytotal":"1.93 GB","netmask":"255.255.0.0","network_docker0":"172.17.0.0","network_eth0":"192.168.1.0","network_lo":"127.0.0.0","network_weave":"172.24.0.0","operatingsystemrelease":"18.04","path":"/var/lib/gems/2.5.0/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games","physicalprocessorcount":1,"processorcount":"4","ps":"ps -ef","puppetversion":"5.4.0","rubysitedir":"/usr/local/lib/site_ruby/2.5.0","rubyversion":"2.5.1","selinux":"false","sshrsakey":"AAAAB3NzaC1yc2EAAAADAQABAAABAQDNfqIh9u1n6hnzc/m9UBY+x3WPYJ6oEQE6CwgVPuL0F0ZPnl8U+NsUGwezYnszdGyyw08NNrxDBW881+rrXtFFpbd8Owl0/AcEVAr1iCPbP5v/jZ7VYkXJJiEqiupSPfmkhbuCWviYqK4VFhiKyhnRrkojnzfCZrSDh0BpZj+jGZTV4bPvxF9iCq2e4ySNt4Icmw0//pMDrvCYqPqeuJT5svG7ULTkIqWBh2p2/Nihe+AQZ2GfwbnrQlfDED83i6a8igdux3C7ERhP05N4IXdKcWXR23a6rfo/f+tAMQqGxpo5m6PwLjyOpbYXpkkU/gNrS7u4IoVq8IN8u1MsgI5P","sshfp_rsa":"SSHFP 1 1 24b84ae09b7f8db80ed93ca2fb83d3702f43746a\nSSHFP 1 2 74bf878c7bbfcf1b60dc2811a0d6564476f975e6370e87fb03f43a26034761e7","sshecdsakey":"AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBD315RI/2z56nPdxYxXmGHuZmxEPcScc5Mna4+5j1T4L5LJ27886y6l+g04keuaJZJnMN3UTU04zw8vwqgt2x4k=","sshfp_ecdsa":"SSHFP 3 1 6eb842eea4719e00d2227b466a09e5e2289d9e73\nSSHFP 3 2 dc8b86430645fd7cfe394d666a866cde400cfcb3c0ef38ddf931d6998be86528","timezone":"UTC","uniqueid":"a8c00501","uptime":"1 day","uptime_days":1,"uptime_hours":27,"uptime_seconds":99702,"virtual":"physical","is_virtual":"false"}

facts/2.0/amazon-2017-x86_64.facts

@@ -11,7 +11,7 @@
   "mtu_lo": "65536",
   "architecture": "x86_64",
   "macaddress": "02:85:E9:60:90:D4",
-  "domain": "us-gov-west-1.compute.internal",
+  "domain": "example.com",
   "operatingsystemmajrelease": "4",
   "fqdn": "foo.example.com",
   "id": "root",

facts/2.0/ubuntu-18.04-aarch64.facts

@@ -1,4 +1,5 @@
 {
+  "domain": "example.com",
   "fqdn": "foo.example.com",
   "gem_version": "~> 2.0.0",
   "selinux": "false",

facts/2.1/amazon-2017-x86_64.facts

@@ -11,7 +11,7 @@
   "mtu_lo": "65536",
   "architecture": "x86_64",
   "macaddress": "02:85:E9:60:90:D4",
-  "domain": "us-gov-west-1.compute.internal",
+  "domain": "example.com",
   "operatingsystemmajrelease": "4",
   "fqdn": "foo.example.com",
   "id": "root",

facts/2.1/ubuntu-18.04-aarch64.facts

@@ -1,4 +1,5 @@
 {
+  "domain": "example.com",
   "gem_version": "~> 2.1.0",
   "selinux": "false",
   "kernelrelease": "4.19.20-meson64",

facts/2.2/amazon-2017-x86_64.facts

@@ -11,7 +11,7 @@
   "mtu_lo": "65536",
   "architecture": "x86_64",
   "macaddress": "02:85:E9:60:90:D4",
-  "domain": "us-gov-west-1.compute.internal",
+  "domain": "example.com",
   "operatingsystemmajrelease": "2017",
   "processors": {
     "models": [

facts/2.2/ubuntu-18.04-aarch64.facts

@@ -1,4 +1,5 @@
 {
+  "domain": "example.com",
   "gem_version": "~> 2.2.0",
   "selinux": "false",
   "kernelrelease": "4.19.20-meson64",

facts/2.3/amazon-2017-x86_64.facts

@@ -11,7 +11,7 @@
   "mtu_lo": 65536,
   "architecture": "x86_64",
   "macaddress": "02:85:E9:60:90:D4",
-  "domain": "us-gov-west-1.compute.internal",
+  "domain": "example.com",
   "operatingsystemmajrelease": "2017",
   "processors": {
     "models": [

facts/2.3/ubuntu-18.04-aarch64.facts

@@ -1,4 +1,5 @@
 {
+  "domain": "example.com",
   "gem_version": "~> 2.3.0",
   "selinux": false,
   "kernelrelease": "4.19.20-meson64",

facts/2.4/amazon-2017-x86_64.facts

@@ -11,7 +11,7 @@
   "mtu_lo": 65536,
   "architecture": "x86_64",
   "macaddress": "02:85:E9:60:90:D4",
-  "domain": "us-gov-west-1.compute.internal",
+  "domain": "example.com",
   "operatingsystemmajrelease": "2017",
   "processors": {
     "models": [

facts/2.4/ubuntu-18.04-aarch64.facts

@@ -1,4 +1,5 @@
 {
+  "domain": "example.com",
   "gem_version": "~> 2.4.0",
   "selinux": false,
   "kernelrelease": "4.19.20-meson64",

facts/2.4/windows-2012 r2-x64.facts

@@ -1,4 +1,5 @@
 {
+  "domain": "example.com",
   "dir": "C:\\Program Files\\Puppet Labs\\Puppet\\facter",
   "env_windows_installdir": "C:\\Program Files\\Puppet Labs\\Puppet",
   "fqdn": "foo.example.com",

facts/2.4/windows-7-x64.facts

@@ -1,4 +1,5 @@
 {
+  "domain": "example.com",
   "dir": "C:\\Program Files\\Puppet Labs\\Puppet\\facter",
   "env_windows_installdir": "C:\\Program Files\\Puppet Labs\\Puppet",
   "fqdn": "foo.example.com",

facts/2.5/ubuntu-18.04-aarch64.facts

@@ -1,4 +1,5 @@
 {
+  "domain": "example.com",
   "gem_version": "~> 2.5.0",
   "selinux": false,
   "kernelrelease": "4.19.20-meson64",

facts/3.14/ubuntu-21.04-x86_64.facts

@@ -28,7 +28,7 @@
       "size_bytes": 53687091200
     }
   },
-  "domain": "ubuntu.towo.people.b1-systems.de",
+  "domain": "example.com",
   "facterversion": "3.14.20",
   "filesystems": "ext2,ext3,ext4,squashfs,vfat",
   "fips_enabled": false,
@@ -312,7 +312,7 @@
   "network_public": "8.8.8.8",
   "networking": {
     "dhcp": "8.8.8.8",
-    "domain": "ubuntu.towo.people.b1-systems.de",
+    "domain": "example.com",
     "fqdn": "foo.example.com",
     "hostname": "2104",
     "interfaces": {

spec/facts_spec.rb

@@ -133,10 +133,11 @@
         expect(content['systemd_version']).to be_nil
         expect(content['systemd_internal_services']).to be_nil
       end
-      it 'contains a legacy hostname and fqdn fact' do
+      it 'contains a legacy hostname, domain and fqdn fact' do
         pending KNOWN_HOSTNAME_PENDING[relative_path] if KNOWN_HOSTNAME_PENDING.key?(relative_path)
         expect(content['hostname']).to eq('foo')
         expect(content['fqdn']).to eq('foo.example.com')
+        expect(content['domain']).to eq('example.com')
       end
     end
   end