facterdb 1.11.0 → 1.13.0

data/facts/Vagrantfile

@@ -23,13 +23,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     host.vm.provision "shell", path: "get_facts.sh"
     host.vm.provision "shell", inline: "/sbin/shutdown -h now"
   end
-  config.vm.define "linuxmint-18-x86_64" do |host|
-    host.vm.box = "artem-sidorenko/mint-18.1-cinnamon"
-    host.vm.provision "shell", inline: "apt-get update && apt-get install -y ruby ruby-dev libc6-dev"
-    host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
-    host.vm.provision "shell", path: "get_facts.sh"
-    host.vm.provision "shell", inline: "/sbin/shutdown -h now"
-  end
   config.vm.define "linuxmint-19-x86_64" do |host|
     host.vm.box = "ltsp/linuxmint-19.1-cinnamon-64bit"
     host.vm.provision "shell", inline: "export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get install -y ruby ruby-dev libc6-dev"
@@ -43,6 +36,24 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     host.vm.provision "shell", path: "get_facts.sh"
     host.vm.provision "shell", inline: "/sbin/shutdown -h now"
   end
+  config.vm.define "ubuntu-20.04-x86_64" do |host|
+    host.vm.box = "ubuntu/focal64"
+    host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
+    host.vm.provision "shell", path: "get_facts.sh"
+    host.vm.provision "shell", inline: "/sbin/shutdown -h now"
+  end
+  config.vm.define "ubuntu-21.04-x86_64" do |host|
+    host.vm.box = "ubuntu/hirsute64"
+    host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
+    host.vm.provision "shell", path: "get_facts.sh"
+    host.vm.provision "shell", inline: "/sbin/shutdown -h now"
+  end
+  config.vm.define "ubuntu-21.10-x86_64" do |host|
+    host.vm.box = "ubuntu/impish64"
+    host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
+    host.vm.provision "shell", path: "get_facts.sh"
+    host.vm.provision "shell", inline: "/sbin/shutdown -h now"
+  end
   config.vm.define "centos-7-x86_64" do |host|
     host.vm.box = "centos/7"
     host.vm.network :private_network, ip: '10.0.0.2'
@@ -70,7 +81,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     host.vm.provision "shell", inline: "/sbin/shutdown -h now"
   end
   config.vm.define "rockylinux-8-x86_64" do |host|
-    host.vm.box = "generic/rocky8"
+    host.vm.box = "rockylinux/8"
     host.vm.synced_folder ".", "/vagrant"
     host.vm.provision "shell", inline: "dnf -y install wget make gcc net-tools"
     host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
@@ -115,34 +126,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     host.vm.provision "shell", path: "get_facts.sh"
     host.vm.provision "shell", inline: "/sbin/shutdown -h now"
   end
-  config.vm.define "opensuse-12-x86_64" do |host|
-    host.vm.box = "alexeym/opensuse-12.3"
-    host.vm.provision "shell", inline: "zypper install -y rubygems ruby-devel make gcc"
-    host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
-    host.vm.provision "shell", path: "get_facts.sh"
-    host.vm.provision "shell", inline: "/sbin/shutdown -h now"
-  end
-  config.vm.define "opensuse-13-x86_64" do |host|
-    host.vm.box = "chef/opensuse-13.1"
-    host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
-    host.vm.provision "shell", path: "get_facts.sh"
-    host.vm.provision "shell", inline: "/sbin/shutdown -h now"
-  end
-  config.vm.define "opensuse-13.2-x86_64" do |host|
-    host.vm.box = "opensuse/openSUSE-13.2-x86_64"
-    host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
-    host.vm.provision "shell", path: "get_facts.sh"
-  end
-  config.vm.define "opensuse-42.1-x86_64" do |host|
-    host.vm.box = "opensuse/openSUSE-42.1-x86_64"
-    host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
-    host.vm.provision "shell", path: "get_facts.sh"
-  end
-  config.vm.define "opensuse-42.2-x86_64" do |host|
-    host.vm.box = "opensuse/openSUSE-42.2-x86_64"
-    host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
-    host.vm.provision "shell", path: "get_facts.sh"
-  end
   config.vm.define "opensuse-42.3-x86_64" do |host|
     host.vm.box = "opensuse/openSUSE-42.3-x86_64"
     host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
@@ -198,32 +181,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     host.vm.provision "shell", path: "get_facts.sh"
     host.vm.provision "shell", inline: "/sbin/shutdown -i S -g0 -y 'Bye' &"
   end
-  config.vm.define "openbsd-6.2-x86_64" do |host|
-    host.vm.box = "bodgit/openbsd-6.2-amd64"
-    host.vm.network :private_network, ip: '10.0.0.2'
-    host.vm.synced_folder ".", "/vagrant", :nfs => true
-    host.vm.provision "shell", inline: <<-SCRIPT.gsub(/^ +/, '')
-      . ~/.profile
-
-      pkg_info -qe 'bash->=0' || pkg_add -I bash
-    SCRIPT
-    host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
-    host.vm.provision "shell", path: "get_facts.sh"
-    host.vm.provision "shell", inline: "/sbin/shutdown -h now"
-  end
-  config.vm.define "openbsd-6.3-x86_64" do |host|
-    host.vm.box = "bodgit/openbsd-6.3-amd64"
-    host.vm.network :private_network, ip: '10.0.0.2'
-    host.vm.synced_folder ".", "/vagrant", :nfs => true
-    host.vm.provision "shell", inline: <<-SCRIPT.gsub(/^ +/, '')
-      . ~/.profile
-
-      pkg_info -qe 'bash->=0' || pkg_add -I bash
-    SCRIPT
-    host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
-    host.vm.provision "shell", path: "get_facts.sh"
-    host.vm.provision "shell", inline: "/sbin/shutdown -h now"
-  end
   config.vm.define "openbsd-6.4-x86_64" do |host|
     host.vm.box = "generic/openbsd6"
     host.vm.box_version = "~> 1.9.18"
@@ -305,4 +262,14 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     host.vm.provision "shell", path: "get_facts.sh"
     host.vm.provision "shell", inline: "/sbin/shutdown -h now"
   end
+  config.vm.define "fedora-35-x86_64" do |host|
+    host.vm.box = "generic/fedora35"
+    host.vm.synced_folder ".", "/vagrant"
+    # there's no official support for fedora 35, so we need ruby 2.7 and facter from Fedora
+    host.vm.provision "shell", inline: "dnf -y module install ruby:2.7/default"
+    host.vm.provision "shell", inline: "dnf -y install wget make gcc net-tools facter ruby-devel"
+    host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
+    host.vm.provision "shell", path: "get_facts.sh"
+    host.vm.provision "shell", inline: "/sbin/shutdown -h now"
+  end
 end

data/facts/get_facts.sh

@@ -30,23 +30,7 @@ elif test -f /usr/bin/apt-get; then
   osfamily='Debian'
 elif test -f /etc/redhat-release ; then
   operatingsystemmajrelease=$(rpm -qf /etc/redhat-release --queryformat '%{version}' | cut -f1 -d'.')
-  case $(rpm -qf /etc/redhat-release --queryformat '%{name}') in
-  almalinux*)
-    osfamily='AlmaLinux'
-    ;;
-  centos*|redhat*)
-    osfamily='RedHat'
-    ;;
-  fedora*)
-    osfamily='Fedora'
-    ;;
-  rocky-*)
-    osfamily='RockyLinux'
-    ;;
-  *)
-    echo 'Failed to determine osfamily from /etc/redhat-release'
-    exit 1
- esac
+  osfamily='RedHat'
 elif test -f '/usr/bin/pacman'; then
   operatingsystemmajrelease=3
   osfamily='Archlinux'
@@ -54,118 +38,22 @@ elif test -f '/etc/gentoo-release'; then
   osfamily='Gentoo'
 elif test -f '/etc/os-release' && grep -q 'Amazon' '/etc/os-release'; then
   osfamily='RedHat'
-  operatingsystemmajrelease=$(rpm -qf /etc/os-release --queryformat '%{version}' | cut -f1 -d'.')
-  if [[ $operatingsystemmajrelease -eq 2 ]]; then
-    operatingsystemmajrelease='7'
-  else
-    operatingsystemmajrelease='6'
-  fi
+  operatingsystemmajrelease='7'
 else
   osfamily=$(uname)
 fi
 
 case "${osfamily}" in
-'Fedora')
-
-  yum install -y "https://yum.puppetlabs.com/puppetlabs-release-pc1-fedora-${operatingsystemmajrelease}.noarch.rpm"
-  # Puppet 4 doesn't support Fedora 28 anymore
-  if [[ "${?}" == 0 ]]; then
-    for puppet_agent_version in 1.5.3-1 1.6.0-1 1.6.1-1 1.6.2-1 1.7.0-1 1.10.12-1; do
-      dnf install -y "puppet-agent-${puppet_agent_version}.fedoraf${operatingsystemmajrelease}"
-      if [[ "${?}" == 0 ]]; then
-        output_file="/vagrant/$(facter --version | cut -d. -f1,2)/$(facter operatingsystem | tr '[:upper:]' '[:lower:]')-$(facter operatingsystemmajrelease)-$(facter hardwaremodel).facts"
-        mkdir -p $(dirname ${output_file})
-        facter --show-legacy -p -j | tee ${output_file}
-      fi
-    done
-    yum remove -y puppetlabs-release-pc1
-  fi
-  # Puppet 5
-  yum install -y "https://yum.puppetlabs.com/puppet5/puppet5-release-fedora-${operatingsystemmajrelease}.noarch.rpm"
-  if [[ "${?}" == 0 ]]; then
-    for puppet_agent_version in 5.3.1-1 5.3.2-1 5.3.3-1 5.3.4-1 5.3.5-1 5.4.0-1 5.5.16-1; do
-      # Package naming changed with Fedora 28
-      [[ ${operatingsystemmajrelease} -ge 28 ]] && osprefix='fc' || osprefix='fedoraf'
-      echo  dnf install -y "puppet-agent-${puppet_agent_version}.${osprefix}${operatingsystemmajrelease}"
-      dnf install -y "puppet-agent-${puppet_agent_version}.${osprefix}${operatingsystemmajrelease}"
-      if [[ "${?}" == 0 ]]; then
-        output_file="/vagrant/$(facter --version | cut -d. -f1,2)/$(facter operatingsystem | tr '[:upper:]' '[:lower:]')-$(facter operatingsystemmajrelease)-$(facter hardwaremodel).facts"
-        echo "Outputfile: $output_file"
-        mkdir -p $(dirname ${output_file})
-        facter --show-legacy -p -j | tee ${output_file}
-      fi
-    done
-    yum remove -y puppet5-release
-  fi
-  # Puppet 6
-  yum install -y "https://yum.puppetlabs.com/puppet6-release-fedora-${operatingsystemmajrelease}.noarch.rpm"
-  if [[ "${?}" == 0 ]]; then
-    for puppet_agent_version in 6.25.0-1; do
-      dnf install -y "puppet-agent-${puppet_agent_version}.fc${operatingsystemmajrelease}"
-      if [[ "${?}" == 0 ]]; then
-        output_file="/vagrant/$(facter --version | cut -d. -f1,2)/$(facter operatingsystem | tr '[:upper:]' '[:lower:]')-$(facter operatingsystemmajrelease)-$(facter hardwaremodel).facts"
-        mkdir -p $(dirname ${output_file})
-        facter --show-legacy -p -j | tee ${output_file}
-      fi
-    done
-    yum remove -y puppet6-release
-  fi
-  # Puppet 7
-  if [[ $operatingsystemmajrelease == '33' ]] && command -v facter &> /dev/null; then
-    output_file="/vagrant/$(facter --version | cut -d. -f1,2)/$(facter operatingsystem | tr '[:upper:]' '[:lower:]')-$(facter operatingsystemmajrelease)-$(facter hardwaremodel).facts"
-    mkdir -p $(dirname ${output_file})
-    facter --show-legacy -p -j | tee ${output_file}
-  fi
-  yum install -y "https://yum.puppetlabs.com/puppet7-release-fedora-${operatingsystemmajrelease}.noarch.rpm"
-  if [[ "${?}" == 0 ]]; then
-    for puppet_agent_version in 7.12.0-1; do
-      dnf install -y "puppet-agent-${puppet_agent_version}.fc${operatingsystemmajrelease}"
-      if [[ "${?}" == 0 ]]; then
-        output_file="/vagrant/$(facter --version | cut -d. -f1,2)/$(facter operatingsystem | tr '[:upper:]' '[:lower:]')-$(facter operatingsystemmajrelease)-$(facter hardwaremodel).facts"
-        mkdir -p $(dirname ${output_file})
-        facter --show-legacy -p -j | tee ${output_file}
-      fi
-    done
-    yum remove -y puppet6-release
-  fi
-  ;;
 'RedHat')
-  if [[ ${operatingsystemmajrelease} -eq 5 ]]; then
-    # CentOS 5 can no longer wget the release file with HTTPS due to mis-matched SSL support:
-    http_method='http'
-    # The default CentOS repositories no longer work and prevent yum from working:
-    rm -f /etc/yum.repos.d/CentOS*
+  . /etc/os-release
+  if [[ $ID == fedora ]]; then
+    distcode=fedora
   else
-    http_method='https'
-  fi
-  wget "${http_method}://yum.puppetlabs.com/puppetlabs-release-pc1-el-${operatingsystemmajrelease}.noarch.rpm" -O /tmp/puppetlabs-release-pc1.rpm
-  if test -f /tmp/puppetlabs-release-pc1.rpm; then
-    rpm -ivh /tmp/puppetlabs-release-pc1.rpm
-    for puppet_agent_version in 1.2.2 1.4.2 1.5.3 1.10.4; do
-      if yum install -y puppet-agent-${puppet_agent_version}; then
-        output_file="/vagrant/$(facter --version | cut -d. -f1,2)/$(facter operatingsystem | tr '[:upper:]' '[:lower:]')-$(facter operatingsystemmajrelease)-$(facter hardwaremodel).facts"
-        mkdir -p $(dirname ${output_file})
-        facter --show-legacy -p -j | tee ${output_file}
-      fi
-    done
-    yum remove -y puppetlabs-release-pc1
-  fi
-  wget "http://yum.puppetlabs.com/puppet5/puppet5-release-el-${operatingsystemmajrelease}.noarch.rpm" -O /tmp/puppet5-release.rpm
-  if test -f /tmp/puppet5-release.rpm; then
-    rpm -ivh /tmp/puppet5-release.rpm
-    for puppet_agent_version in 5.0.1 5.1.0 5.3.7 5.4.0 5.5.16; do
-      if yum install -y puppet-agent-${puppet_agent_version}; then
-        output_file="/vagrant/$(facter --version | cut -d. -f1,2)/$(facter operatingsystem | tr '[:upper:]' '[:lower:]')-$(facter operatingsystemmajrelease)-$(facter hardwaremodel).facts"
-        mkdir -p $(dirname ${output_file})
-        facter --show-legacy -p -j | tee ${output_file}
-      fi
-    done
-    yum remove -y puppet5-release
+    distcode=el
   fi
-  wget "http://yum.puppetlabs.com/puppet6-release-el-${operatingsystemmajrelease}.noarch.rpm" -O /tmp/puppet6-release.rpm
-  if test -f /tmp/puppet6-release.rpm; then
-    rpm -ivh /tmp/puppet6-release.rpm
-    for puppet_agent_version in 6.2.0 6.4.2 6.6.0; do
+  yum -y install "https://yum.puppetlabs.com/puppet6-release-${distcode}-${operatingsystemmajrelease}.noarch.rpm"
+  if [[ "${?}" == 0 ]]; then
+    for puppet_agent_version in 6.25.0; do
       if yum install -y puppet-agent-${puppet_agent_version}; then
         output_file="/vagrant/$(facter --version | cut -d. -f1,2)/$(facter operatingsystem | tr '[:upper:]' '[:lower:]')-$(facter operatingsystemmajrelease)-$(facter hardwaremodel).facts"
         mkdir -p $(dirname ${output_file})
@@ -187,49 +75,8 @@ case "${osfamily}" in
     yum remove -y puppet7-release
   fi
   ;;
-'RockyLinux'|'AlmaLinux')
-  dnf localinstall -y "http://yum.puppetlabs.com/puppet6-release-el-${operatingsystemmajrelease}.noarch.rpm"
-  if dnf install -y puppet-agent; then
-    output_file="/vagrant/$(facter --version | cut -d. -f1,2)/$(facter operatingsystem | tr '[:upper:]' '[:lower:]')-$(facter operatingsystemmajrelease)-$(facter hardwaremodel).facts"
-    mkdir -p $(dirname ${output_file})
-    facter --show-legacy -p -j | tee ${output_file}
-  fi
-  ;;
-
 'Debian')
-  if [[ "serena" =~ ${lsbdistcodename} ]]; then
-    lsbdistcodename='xenial'
-  fi
-  if [[ "tessa" =~ ${lsbdistcodename} ]]; then
-    lsbdistcodename='bionic'
-  fi
   apt_install curl
-  curl "https://apt.puppetlabs.com/puppetlabs-release-pc1-${lsbdistcodename}.deb" -o /tmp/puppetlabs-release-pc1.deb
-  if test "$?" -eq 0 -a -f /tmp/puppetlabs-release-pc1.deb; then
-    dpkg --install /tmp/puppetlabs-release-pc1.deb
-    apt-get update
-    for puppet_agent_version in 1.2.2 1.4 1.5 1.7 1.8 1.10; do
-      if apt_install puppet-agent=${puppet_agent_version}*; then
-        output_file="/vagrant/$(facter --version | cut -d. -f1,2)/$(facter operatingsystem | tr '[:upper:]' '[:lower:]')-$(facter operatingsystemmajrelease)-$(facter hardwaremodel).facts"
-        mkdir -p $(dirname ${output_file})
-        facter --show-legacy -p -j | tee ${output_file}
-      fi
-    done
-    apt-get -y remove --purge puppetlabs-release-pc1
-  fi
-  curl "https://apt.puppetlabs.com/puppet5-release-${lsbdistcodename}.deb" -o /tmp/puppet5-release.deb
-  if test "$?" -eq 0 -a -f /tmp/puppet5-release.deb; then
-    dpkg --install /tmp/puppet5-release.deb
-    apt-get update
-    for puppet_agent_version in 5.0 5.1 5.3 5.4 5.5; do
-      if apt_install puppet-agent=${puppet_agent_version}*; then
-        output_file="/vagrant/$(facter --version | cut -d. -f1,2)/$(facter operatingsystem | tr '[:upper:]' '[:lower:]')-$(facter operatingsystemmajrelease)-$(facter hardwaremodel).facts"
-        mkdir -p $(dirname ${output_file})
-        facter --show-legacy -p -j | tee ${output_file}
-      fi
-    done
-    apt-get -y remove --purge puppet5-release
-  fi
   curl "https://apt.puppetlabs.com/puppet6-release-${lsbdistcodename}.deb" -o /tmp/puppet6-release.deb
   if test "$?" -eq 0 -a -f /tmp/puppet6-release.deb; then
     dpkg --install /tmp/puppet6-release.deb
@@ -260,7 +107,7 @@ case "${osfamily}" in
 
   # There are no puppet-agent packages for Buster yet, so generate a Facter 3.x
   # fact set from the official Debian package.
-  if [[ "buster" = "${lsbdistcodename}" ]]; then
+  if [[ "buster" = "${lsbdistcodename}" || "hirsute" =~ ${lsbdistcodename} || "impish" =~ ${lsbdistcodename} ]]; then
     apt_install ruby rubygems ruby-dev puppet facter
     output_file="/vagrant/$(facter --version | cut -d. -f1,2)/$(facter operatingsystem | tr '[:upper:]' '[:lower:]')-$(facter operatingsystemmajrelease)-$(facter hardwaremodel).facts"
     mkdir -p $(dirname ${output_file})
@@ -299,27 +146,6 @@ case "${osfamily}" in
   else
     http_method='https'
   fi
-  if rpm -Uvh ${http_method}://yum.puppet.com/puppetlabs-release-pc1-sles-${operatingsystemmajrelease}.noarch.rpm; then
-    zypper --gpg-auto-import-keys --non-interactive refresh
-    for puppet_agent_version in 1.6.2 1.7.2 1.8.3 1.9.3 1.10.8; do
-      if zypper --non-interactive install puppet-agent-${puppet_agent_version}; then
-        output_file="/vagrant/$(facter --version | cut -d. -f1,2)/$(facter operatingsystem | tr '[:upper:]' '[:lower:]')-$(facter operatingsystemmajrelease)-$(facter hardwaremodel).facts"
-        mkdir -p $(dirname ${output_file})
-        facter --show-legacy -p -j | tee ${output_file}
-      fi
-    done
-    zypper --non-interactive remove puppetlabs-release-pc1
-  fi
-  if rpm -Uvh ${http_method}://yum.puppet.com/puppet5/puppet5-release-sles-${operatingsystemmajrelease}.noarch.rpm; then
-    for puppet_agent_version in 5.0.1 5.1.0 5.2.0 5.3.2 5.4.0 5.5.16; do
-      if zypper --gpg-auto-import-keys --non-interactive install puppet-agent-${puppet_agent_version}; then
-        output_file="/vagrant/$(facter --version | cut -d. -f1,2)/$(facter operatingsystem | tr '[:upper:]' '[:lower:]')-$(facter operatingsystemmajrelease)-$(facter hardwaremodel).facts"
-        mkdir -p $(dirname ${output_file})
-        facter --show-legacy -p -j | tee ${output_file}
-      fi
-    done
-    zypper --non-interactive remove puppet5-release
-  fi
   if rpm -Uvh ${http_method}://yum.puppet.com/puppet6-release-sles-${operatingsystemmajrelease}.noarch.rpm; then
     for puppet_agent_version in 6.2.0 6.4.2 6.6.0; do
       if zypper --gpg-auto-import-keys --non-interactive install puppet-agent-${puppet_agent_version}; then

data/lib/facterdb/version.rb

@@ -1,5 +1,5 @@
 module FacterDB
   module Version
-    STRING = '1.11.0'
+    STRING = '1.13.0'
   end
 end

data/spec/facts_spec.rb

@@ -62,26 +62,6 @@ describe 'Default Facts' do
     end
   end
 
-  KNOWN_IPADDRESS_PENDING = {
-    'facts/1.6/fedora-19-i386.facts' => 'unable to regenerate facts',
-    'facts/1.6/fedora-19-x86_64.facts' => 'unable to regenerate facts',
-    'facts/2.1/archlinux-x86_64.facts' => 'no ifconfig package',
-    'facts/3.10/ubuntu-18.04-aarch64.facts' => 'unable to regenerate facts',
-    'facts/1.6/archlinux-x86_64.facts' => 'no ifconfig package',
-    'facts/2.4/archlinux-x86_64.facts' => 'no ifconfig package',
-    'facts/3.2/aix-61-powerpc.facts' => 'unable to regenerate facts',
-    'facts/3.2/aix-71-powerpc.facts' => 'unable to regenerate facts',
-    'facts/3.2/aix-53-powerpc.facts' => 'unable to regenerate facts',
-    'facts/2.3/archlinux-x86_64.facts' => 'no ifconfig package',
-    'facts/2.5/archlinux-x86_64.facts' => 'no ifconfig package',
-    'facts/1.7/archlinux-x86_64.facts' => 'no ifconfig package',
-    'facts/2.0/archlinux-x86_64.facts' => 'no ifconfig package',
-    'facts/2.2/archlinux-x86_64.facts' => 'no ifconfig package',
-    'facts/3.6/pcs-6-x86_64.facts' => 'unable to regenerate facts',
-    'facts/3.0/ubuntu-15.10-x86_64.facts' => 'no puppet-agent package',
-    'facts/3.0/ubuntu-15.10-i386.facts' => 'no puppet-agent package',
-  }
-
   project_dir = Pathname.new(__dir__).parent
   FacterDB.default_fact_files.each do |filepath|
     relative_path = Pathname.new(filepath).relative_path_from(project_dir).to_s
@@ -100,15 +80,41 @@ describe 'Default Facts' do
         expect(content['facterversion']).to have_facter_version(facter_dir_path, filepath)
       end
 
-      it 'contains an ipaddress or networking.ip fact' do
-        pending KNOWN_IPADDRESS_PENDING[relative_path] if KNOWN_IPADDRESS_PENDING.key?(relative_path)
-        case content['facterversion']
-        when /^[1-3]/
-          expect(content['ipaddress']).to not_be_nil.and not_be_empty
-        else
+      it 'contains newer networking facts hash' do
+        if Gem::Version.new(content['facterversion']) >= Gem::Version.new('3.0.0')
           expect(content['networking']['ip']).to not_be_nil.and not_be_empty
+          expect(content['networking']['hostname']).to eq('foo')
+          expect(content['networking']['domain']).to eq('example.com')
+          expect(content['networking']['fqdn']).to eq('foo.example.com')
         end
-        
+      end
+      it 'contains the legacy ipaddress fact' do
+        expect(content['ipaddress']).to not_be_nil.and not_be_empty
+      end
+      it 'contains no facts from puppetlabs/stdlib' do
+        expect(content['root_home']).to be_nil
+        expect(content['service_provider']).to be_nil
+        expect(content['puppet_vardir']).to be_nil
+        expect(content['puppet_environmentpath']).to be_nil
+        expect(content['puppet_server']).to be_nil
+        expect(content['pe_version']).to be_nil
+        expect(content['package_provider']).to be_nil
+      end
+      it 'contains no facts from puppet/systemd' do
+        expect(content['systemd']).to be_nil
+        expect(content['systemd_version']).to be_nil
+        expect(content['systemd_internal_services']).to be_nil
+      end
+      it 'contains a legacy hostname, domain and fqdn fact' do
+        expect(content['hostname']).to eq('foo')
+        expect(content['fqdn']).to eq('foo.example.com')
+        expect(content['domain']).to eq('example.com')
+      end
+      it 'contains the legacy osfamily fact' do
+        expect(content['osfamily']).to_not be_nil
+      end
+      it 'contains the legacy operatingsystem fact' do
+        expect(content['operatingsystem']).to_not be_nil
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facterdb
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-05 00:00:00.000000000 Z
+date: 2022-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls
@@ -1313,6 +1313,7 @@ files:
 - facts/3.14/centos-6-x86_64.facts
 - facts/3.14/centos-7-x86_64.facts
 - facts/3.14/centos-8-x86_64.facts
+- facts/3.14/centos-9-x86_64.facts
 - facts/3.14/darwin-16-x86_64.facts
 - facts/3.14/darwin-17-x86_64.facts
 - facts/3.14/darwin-18-x86_64.facts
@@ -1355,6 +1356,7 @@ files:
 - facts/3.14/ubuntu-18.04-x86_64.facts
 - facts/3.14/ubuntu-20.04-x86_64.facts
 - facts/3.14/ubuntu-21.04-x86_64.facts
+- facts/3.14/ubuntu-21.10-x86_64.facts
 - facts/3.14/windows-10-i386.facts
 - facts/3.14/windows-10-x86_64.facts
 - facts/3.14/windows-2012 r2-core-x86_64.facts
@@ -1744,6 +1746,7 @@ files:
 - facts/4.0/fedora-32-x86_64.facts
 - facts/4.0/fedora-33-x86_64.facts
 - facts/4.0/fedora-34-x86_64.facts
+- facts/4.0/fedora-35-x86_64.facts
 - facts/4.0/freebsd-11-x86_64.facts
 - facts/4.0/freebsd-12-x86_64.facts
 - facts/4.0/freebsd-13-x86_64.facts
@@ -1755,11 +1758,14 @@ files:
 - facts/4.0/solaris-11-sun4v.facts
 - facts/4.0/ubuntu-18.04-x86_64.facts
 - facts/4.0/ubuntu-20.04-x86_64.facts
+- facts/4.0/ubuntu-21.04-x86_64.facts
+- facts/4.0/ubuntu-21.10-x86_64.facts
 - facts/4.1/almalinux-8-x86_64.facts
 - facts/4.1/debian-11-x86_64.facts
 - facts/4.1/fedora-32-x86_64.facts
 - facts/4.1/fedora-33-x86_64.facts
 - facts/4.1/fedora-34-x86_64.facts
+- facts/4.1/fedora-35-x86_64.facts
 - facts/4.1/freebsd-11-x86_64.facts
 - facts/4.1/freebsd-12-x86_64.facts
 - facts/4.1/freebsd-13-x86_64.facts
@@ -1767,6 +1773,8 @@ files:
 - facts/4.1/rocky-8-x86_64.facts
 - facts/4.1/ubuntu-18.04-x86_64.facts
 - facts/4.1/ubuntu-20.04-x86_64.facts
+- facts/4.1/ubuntu-21.04-x86_64.facts
+- facts/4.1/ubuntu-21.10-x86_64.facts
 - facts/4.2/almalinux-8-x86_64.facts
 - facts/4.2/centos-7-x86_64.facts
 - facts/4.2/centos-8-x86_64.facts
@@ -1778,6 +1786,7 @@ files:
 - facts/4.2/fedora-32-x86_64.facts
 - facts/4.2/fedora-33-x86_64.facts
 - facts/4.2/fedora-34-x86_64.facts
+- facts/4.2/fedora-35-x86_64.facts
 - facts/4.2/freebsd-11-x86_64.facts
 - facts/4.2/freebsd-12-x86_64.facts
 - facts/4.2/freebsd-13-x86_64.facts
@@ -1791,6 +1800,8 @@ files:
 - facts/4.2/scientific-7-x86_64.facts
 - facts/4.2/ubuntu-18.04-x86_64.facts
 - facts/4.2/ubuntu-20.04-x86_64.facts
+- facts/4.2/ubuntu-21.04-x86_64.facts
+- facts/4.2/ubuntu-21.10-x86_64.facts
 - facts/Gemfile
 - facts/Vagrantfile
 - facts/Windows_README.md
@@ -1831,14 +1842,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: A Database of OS facts provided by Facter