simp-rspec-puppet-facts 2.0.1 → 2.1.0

data/facts/Vagrantfile

@@ -1,7 +1,3 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-
 # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
 VAGRANTFILE_API_VERSION = '2'
 
@@ -10,6 +6,37 @@ DEFAULT_GOOGLE_ZONE = 'us-east1-b'
 
 VM_FQDN = 'foo.example.com'
 
+GOOGLE_PROJECT_ID = ENV.fetch('GOOGLE_CLOUD_PROJECT_ID', nil)
+
+unless GOOGLE_PROJECT_ID
+  $stderr.puts("Warning: GOOGLE_CLOUD_PROJECT_ID not set, will not use GCE")
+end
+
+VALID_OS_TYPES = [
+  'CENTOS',
+  'OEL',
+  'RHEL'
+]
+
+found_os = false
+
+VALID_OS_TYPES.each do |os|
+  if ENV.fetch(os, nil)
+    found_os = true
+    break
+  end
+end
+
+unless found_os
+  $stderr.puts("Error: You must set one of ['#{VALID_OS_TYPES.join(', ')}'] as an environment variable to 'yes'")
+  exit 1
+end
+
+if Dir.glob('modules/*').empty?
+  $stderr.puts('No modules found in the "modules" directory. Hit ^C to exit or Enter to proceed.')
+  $stdin.gets
+end
+
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.hostname = VM_FQDN
 
@@ -24,44 +51,45 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     end
   end
 
-  # Reference: https://github.com/mitchellh/vagrant-google#configuration
-  config.vm.provider 'google' do |google, override|
+  if GOOGLE_PROJECT_ID
+    # Reference: https://github.com/mitchellh/vagrant-google#configuration
+    config.vm.provider 'google' do |google, override|
 
-    # The Client Email address for your Service Account
-    google.google_project_id = ENV.fetch('GOOGLE_CLOUD_PROJECT_ID')
+      # The Client Email address for your Service Account
+      google.google_project_id = ENV.fetch('GOOGLE_CLOUD_PROJECT_ID')
 
-    # The Client Email address for your Service Account
-    #  (it should end with gserviceaccount.com)
-    google.google_client_email = ENV.fetch('GOOGLE_CLIENT_EMAIL')
+      # The Client Email address for your Service Account
+      #  (it should end with gserviceaccount.com)
+      google.google_client_email = ENV.fetch('GOOGLE_CLIENT_EMAIL')
 
-    if ENV.key? 'GOOGLE_KEY_LOCATION'
-      # The location of the P12 private key file matching your Service Account.
-      google.google__key_location = ENV['GOOGLE_KEY_LOCATION']
-    else
-      # The location of the JSON private key file matching your Service Account.
-      # "/path/to/your/private-key.json"
-      google.google_json_key_location = ENV.fetch('GOOGLE_JSON_KEY_LOCATION')
-    end
+      if ENV.key? 'GOOGLE_KEY_LOCATION'
+        # The location of the P12 private key file matching your Service Account.
+        google.google__key_location = ENV['GOOGLE_KEY_LOCATION']
+      else
+        # The location of the JSON private key file matching your Service Account.
+        # "/path/to/your/private-key.json"
+        google.google_json_key_location = ENV.fetch('GOOGLE_JSON_KEY_LOCATION')
+      end
 
-    # The zone name where the instance will be created.
-    # Make sure to set this to trigger the zone_config
-    google.zone = _zone = ENV.fetch('GOOGLE_ZONE', DEFAULT_GOOGLE_ZONE)
-
-    google.zone_config _zone do |zone|
-    #    zone.name = 'vagrant-rspec-puppet-facts'
-        zone.machine_type = ENV['GOOGLE_MACHINE_TYPE'] || 'g1-small'
-        zone.zone = _zone
-        zone.metadata = {'custom' => 'metadata', 'testing' => 'foobarbaz'}
-        zone.scopes = ['monitoring', 'https://www.googleapis.com/auth/compute']
-        zone.tags = ['vagrant', 'simp-rspec-puppet-facts', 'temporary']
-    end
+      # The zone name where the instance will be created.
+      # Make sure to set this to trigger the zone_config
+      google.zone = _zone = ENV.fetch('GOOGLE_ZONE', DEFAULT_GOOGLE_ZONE)
+
+      google.zone_config _zone do |zone|
+      #    zone.name = 'vagrant-rspec-puppet-facts'
+          zone.machine_type = ENV['GOOGLE_MACHINE_TYPE'] || 'g1-small'
+          zone.zone = _zone
+          zone.metadata = {'custom' => 'metadata', 'testing' => 'foobarbaz'}
+          zone.scopes = ['monitoring', 'https://www.googleapis.com/auth/compute']
+          zone.tags = ['vagrant', 'simp-rspec-puppet-facts', 'temporary']
+      end
 
-    override.ssh.username = ENV.fetch('GOOGLE_SSH_USERNAME')
-    override.ssh.private_key_path = ENV.fetch('GOOGLE_SSH_KEY', '~/.ssh/id_rsa')
-    override.vm.box = 'google/gce'
+      override.ssh.username = ENV.fetch('GOOGLE_SSH_USERNAME')
+      override.ssh.private_key_path = ENV.fetch('GOOGLE_SSH_KEY', '~/.ssh/id_rsa')
+      override.vm.box = 'google/gce'
+    end
   end
 
-
   # Optional: RHEL subscription information
   #
   # A licensed RHEL subscription is required to use yum to configure VMs, and
@@ -87,19 +115,22 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # config.vm.synced_folder ".", "/vagrant", type: "rsync", rsync__exclude: ['.git/']
   config.vm.synced_folder ".", "/vagrant", type: "virtualbox"
 
-  unless ENV['CENTOS'] == 'no'
+  if ENV['CENTOS'] == 'yes'
     config.vm.define "centos-6-x86_64" do |host|
       host.vm.provider 'virtualbox' do |vb,override|
         override.vm.box = "centos/6"
       end
-      host.vm.provider 'google' do |google,override|
-        google.name = 'foo-centos6-64'
-        google.zone = ENV.fetch('GOOGLE_ZONE', DEFAULT_GOOGLE_ZONE)
-        google.zone_config ENV.fetch('GOOGLE_ZONE', DEFAULT_GOOGLE_ZONE) do |zone|
-          zone.image = 'centos-6-v20170717'
+
+      if GOOGLE_PROJECT_ID
+        host.vm.provider 'google' do |google,override|
+          google.name = 'foo-centos6-64'
+          google.zone = ENV.fetch('GOOGLE_ZONE', DEFAULT_GOOGLE_ZONE)
+          google.zone_config ENV.fetch('GOOGLE_ZONE', DEFAULT_GOOGLE_ZONE) do |zone|
+            zone.image = 'centos-6-v20170717'
+          end
         end
-#        override.vm.provision 'shell', inline: "/use/bin/hostname #{VM_FQDN}"
       end
+
       host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
       host.vm.provision "shell", path: "scripts/get_facts_for_each_facter.sh", args: "'centos 6'"
       host.vm.provision "shell", inline: "/sbin/shutdown -h now" unless ENV['SHUTDOWN'] == 'no'
@@ -109,13 +140,36 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       host.vm.provider 'virtualbox' do |vb,override|
         override.vm.box = "centos/7"
       end
-      host.vm.provider 'google' do |google,override|
-        google.name = 'foo-centos7-64'
-        google.zone = ENV.fetch('GOOGLE_ZONE', DEFAULT_GOOGLE_ZONE)
-        google.zone_config ENV.fetch('GOOGLE_ZONE', DEFAULT_GOOGLE_ZONE) do |zone|
-          zone.image = 'centos-7-v20170719'
+
+      if GOOGLE_PROJECT_ID
+        host.vm.provider 'google' do |google,override|
+          google.name = 'foo-centos7-64'
+          google.zone = ENV.fetch('GOOGLE_ZONE', DEFAULT_GOOGLE_ZONE)
+          google.zone_config ENV.fetch('GOOGLE_ZONE', DEFAULT_GOOGLE_ZONE) do |zone|
+            zone.image = 'centos-7-v20170719'
+          end
         end
- #       override.vm.provision 'shell', inline: "/usr/bin/hostnamectl set-hostname #{VM_FQDN}"
+      end
+
+      host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
+      host.vm.provision "shell", path: "scripts/get_facts_for_each_facter.sh", args: "'centos 7'"
+      host.vm.provision "shell", inline: "/sbin/shutdown -h now" unless ENV['SHUTDOWN'] == 'no'
+    end
+  end
+
+  if ENV['OEL'] == 'yes'
+    config.vm.define "oel-6-x86_64" do |host|
+      host.vm.provider 'virtualbox' do |vb,override|
+        override.vm.box = "elastic/oel-6-x86_64"
+      end
+      host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
+      host.vm.provision "shell", path: "scripts/get_facts_for_each_facter.sh", args: "'centos 6'"
+      host.vm.provision "shell", inline: "/sbin/shutdown -h now" unless ENV['SHUTDOWN'] == 'no'
+    end
+
+    config.vm.define "oel-7-x86_64" do |host|
+      host.vm.provider 'virtualbox' do |vb,override|
+        override.vm.box = "elastic/oel-7-x86_64"
       end
       host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
       host.vm.provision "shell", path: "scripts/get_facts_for_each_facter.sh", args: "'centos 7'"
@@ -135,10 +189,12 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         override.vm.box = "anandbitra/redhat-6.5"
       end
 
-      host.vm.provider 'google' do |google,override|
-        google.zone = ENV.fetch('GOOGLE_ZONE', DEFAULT_GOOGLE_ZONE)
-        google.zone_config ENV.fetch('GOOGLE_ZONE', DEFAULT_GOOGLE_ZONE) do |zone|
-          zone.image = 'rhel-6-v20170717'
+      if GOOGLE_PROJECT_ID
+        host.vm.provider 'google' do |google,override|
+          google.zone = ENV.fetch('GOOGLE_ZONE', DEFAULT_GOOGLE_ZONE)
+          google.zone_config ENV.fetch('GOOGLE_ZONE', DEFAULT_GOOGLE_ZONE) do |zone|
+            zone.image = 'rhel-6-v20170717'
+          end
         end
       end
 
@@ -158,17 +214,23 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
        host.vm.provider 'virtualbox' do |vb,override|
          override.vm.box = "mrlesmithjr/rhel-7"
        end
-       host.vm.provider 'google' do |google,override|
-         # google.name = 'foo'
-         google.zone = ENV.fetch('GOOGLE_ZONE', DEFAULT_GOOGLE_ZONE)
-         google.zone_config ENV.fetch('GOOGLE_ZONE', DEFAULT_GOOGLE_ZONE) do |zone|
-           zone.image = 'rhel-7-v20170719'
+
+       if GOOGLE_PROJECT_ID
+         host.vm.provider 'google' do |google,override|
+           # google.name = 'foo'
+           google.zone = ENV.fetch('GOOGLE_ZONE', DEFAULT_GOOGLE_ZONE)
+           google.zone_config ENV.fetch('GOOGLE_ZONE', DEFAULT_GOOGLE_ZONE) do |zone|
+             zone.image = 'rhel-7-v20170719'
+           end
          end
        end
+
        host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
        host.vm.provision "shell", path: "scripts/get_facts_for_each_facter.sh", args: "'#{os} #{ver}'"
        host.vm.provision "shell", inline: "/sbin/shutdown -h now" unless ENV['SHUTDOWN'] == 'no'
      end
-
   end
 end
+
+# -*- mode: ruby -*-
+# vi: set ft=ruby :

data/facts/scripts/gce_scrub_data.rb

@@ -1,9 +1,7 @@
 require 'yaml'
 require 'json'
-require 'deep_merge'
 
-
-# A cowardly Heah merge that only overwrites keys that already exist
+# A cowardly Heap merge that only overwrites keys that already exist
 def creep_merge( j, o )
   result = nil
   if o.is_a? Hash
@@ -12,7 +10,10 @@ def creep_merge( j, o )
       if j.is_a?(Hash)
         unless  j.key?(k)
           warn "!!!!!!!!!  WARNING NO key '#{k}'"
-          require 'pry'; binding.pry if ENV['PRY'] == 'yes'
+          if ENV['PRY'] == 'yes'
+            require 'pry'
+            binding.pry
+          end
         else
           j[k] = creep_merge(j[k], o[k])
         end

data/facts/scripts/gce_scrub_data/centos-6-x86_64.scrub.yaml

@@ -0,0 +1 @@
+facts/scripts/gce_scrub_data/redhat-6-x86_64.scrub.yaml

data/facts/scripts/gce_scrub_data/centos-7-x86_64.scrub.yaml

@@ -0,0 +1 @@
+facts/scripts/gce_scrub_data/redhat-6-x86_64.scrub.yaml

data/facts/scripts/gce_scrub_data/oraclelinux-6-x86_64.scrub.yaml

@@ -0,0 +1 @@
+facts/scripts/gce_scrub_data/redhat-6-x86_64.scrub.yaml

data/facts/scripts/gce_scrub_data/oraclelinux-7-x86_64.scrub.yaml

@@ -0,0 +1 @@
+facts/scripts/gce_scrub_data/redhat-6-x86_64.scrub.yaml

data/facts/scripts/gce_scrub_data/redhat-7-x86_64.scrub.yaml

@@ -0,0 +1 @@
+facts/scripts/gce_scrub_data/redhat-6-x86_64.scrub.yaml

data/facts/scripts/get_facts_for_each_facter.sh

@@ -34,6 +34,8 @@ else
   plabs_ver=$operatingsystem
 fi
 
+$rpm_cmd remove -y puppet* ||:
+
 $rpm_cmd install -y --nogpgcheck "https://yum.puppetlabs.com/puppetlabs-release-pc1-${plabs_ver}-${operatingsystemmajrelease}.noarch.rpm"
 $rpm_cmd install -y --nogpgcheck "https://yum.puppetlabs.com/puppetlabs-release-pc1-${plabs_ver}-${operatingsystemmajrelease}.noarch.rpm"
 $rpm_cmd install -y https://yum.puppetlabs.com/puppet5/puppet5-release-${plabs_ver}-${operatingsystemmajrelease}.noarch.rpm
@@ -41,9 +43,13 @@ $rpm_cmd install -y https://yum.puppetlabs.com/puppet5/puppet5-release-${plabs_v
 # Prereqs
 $rpm_cmd install -y facter rubygem-bundler git augeas-devel \
   libicu-devel libxml2 libxml2-devel libxslt libxslt-devel \
-  gcc gcc-c++ ruby-devel audit bind-utils net-tools
+  gcc gcc-c++ ruby-devel audit bind-utils net-tools rubygem-json
+
+# Work around libcurl issues
+$rpm_cmd update -y libcurl openssl nss
 
-rpm -qi puppet > /dev/null &&  $rpm_cmd remove -y puppet
+to_scrub='.to_scrub'
+echo '' > $to_scrub
 
 # Capture data for (c)facter 3.X
 #                                           *LTS*           +2016.4
@@ -66,7 +72,7 @@ for puppet_agent_version in 1.2.2    1.5.3  1.7.2    1.8.3  1.10.4   5.0.1 ; do
 
   /opt/puppetlabs/puppet/bin/facter gce --strict |&> /dev/null
   if [ $? -eq 0 ]; then
-    /opt/puppetlabs/puppet/bin/ruby /vagrant/scripts/gce_scrub_data.rb "${output_dir}/${output_file}"
+    echo "${output_dir}/${output_file}" >> $to_scrub
   fi
 done
 
@@ -74,11 +80,17 @@ operatingsystem=$( facter operatingsystem | tr '[:upper:]' '[:lower:]' )
 operatingsystemmajrelease=$( facter operatingsystemmajrelease )
 hardwaremodel=$( facter hardwaremodel )
 
-rpm -qi puppet-agent > /dev/null && $rpm_cmd remove -y puppet-agent
+$rpm_cmd remove -y puppet-agent ||:
 
 export PUPPET_VERSION="~> 3.7"
 
-#PATH=/opt/puppetlabs/puppet/bin:$PATH
+# RVM Install for isolation
+gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
+\curl -sSL https://get.rvm.io | bash -s stable
+source /usr/local/rvm/scripts/rvm
+rvm install 2.1.9
+rvm use 2.1.9 --default
+
 gem install bundler --no-ri --no-rdoc --no-format-executable
 bundle install --path vendor/bundler
 
@@ -95,3 +107,9 @@ for version in 1.7.0 2.0.0 2.1.0 2.2.0 2.3.0 2.4.0 2.5.0 ; do
   mkdir -p $( dirname $output_file )
   FACTER_GEM_VERSION="~> ${version}" PUPPET_VERSION="~> 3.7" bundle exec ruby /vagrant/scripts/get_facts.rb | tee $output_file
 done
+
+for file in `cat $to_scrub`; do
+  if [ -f $file ]; then
+    bundle exec ruby /vagrant/scripts/gce_scrub_data.rb $file
+  fi
+done

data/lib/simp/rspec-puppet-facts.rb

@@ -1,13 +1,12 @@
-require 'json'
-require 'puppet'
-
 module Simp; end
 module Simp::RspecPuppetFacts
+  require 'json'
+  require 'puppet'
+
   require File.expand_path('version', File.dirname(__FILE__))
 
   SELINUX_MODES = [:enforcing, :disabled, :permissive]
 
-
   def supported_os_strings( opts )
     supported_os = opts.fetch(:supported_os, RspecPuppetFacts.meta_supported_os)
     hardwaremodels = opts.fetch(:hardwaremodels, ['x86_64'])
@@ -27,7 +26,7 @@ module Simp::RspecPuppetFacts
   def filter_opts( opts, simp_h, filter_type = :reject )
     rfh_hw = opts.fetch(:hardwaremodels, ['x86_64'])
     rfh_os = opts.fetch(:supported_os, RspecPuppetFacts.meta_supported_os).dup
-		_os = rfh_os.send(filter_type) do |os|
+    _os = rfh_os.send(filter_type) do |os|
       _name = os['operatingsystem']
       _rels = os['operatingsystemrelease'].send(filter_type) do |rel|
         _hw = rfh_hw.send(filter_type) do |hw|
@@ -47,7 +46,7 @@ module Simp::RspecPuppetFacts
     opts[:simp_fact_dir_path] ||= File.expand_path("../../facts/",
                                                    File.dirname(__FILE__))
 
-		simp_h         = load_facts(opts[:simp_fact_dir_path])
+    simp_h         = load_facts(opts[:simp_fact_dir_path])
     strings        = supported_os_strings(opts)
     masked_opts    = filter_opts(opts, simp_h, :reject)
     selected_opts  = filter_opts(opts, simp_h, :select)

data/lib/simp/version.rb

@@ -1,4 +1,4 @@
 module Simp; end
 module Simp::RspecPuppetFacts
-  VERSION = '2.0.1'
+  VERSION = '2.1.0'
 end

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
-
-require 'rspec'
+require 'puppetlabs_spec_helper/module_spec_helper'
+require 'rspec-puppet'
 require 'simp/rspec-puppet-facts'
 include Simp::RspecPuppetFacts
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rspec-puppet-facts
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-04 00:00:00.000000000 Z
+date: 2018-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-puppet-facts
@@ -25,6 +25,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: puppetlabs_spec_helper
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -126,54 +140,80 @@ files:
 - Rakefile
 - facts/1.7/centos-6-x86_64.facts
 - facts/1.7/centos-7-x86_64.facts
+- facts/1.7/oraclelinux-6-x86_64.facts
+- facts/1.7/oraclelinux-7-x86_64.facts
 - facts/1.7/redhat-6-x86_64.facts
 - facts/1.7/redhat-7-x86_64.facts
 - facts/2.0/centos-6-x86_64.facts
 - facts/2.0/centos-7-x86_64.facts
+- facts/2.0/oraclelinux-6-x86_64.facts
+- facts/2.0/oraclelinux-7-x86_64.facts
 - facts/2.0/redhat-6-x86_64.facts
 - facts/2.0/redhat-7-x86_64.facts
 - facts/2.1/centos-6-x86_64.facts
 - facts/2.1/centos-7-x86_64.facts
+- facts/2.1/oraclelinux-6-x86_64.facts
+- facts/2.1/oraclelinux-7-x86_64.facts
 - facts/2.1/redhat-6-x86_64.facts
 - facts/2.1/redhat-7-x86_64.facts
 - facts/2.2/centos-6-x86_64.facts
 - facts/2.2/centos-7-x86_64.facts
+- facts/2.2/oraclelinux-6-x86_64.facts
+- facts/2.2/oraclelinux-7-x86_64.facts
 - facts/2.2/redhat-6-x86_64.facts
 - facts/2.2/redhat-7-x86_64.facts
 - facts/2.3/centos-6-x86_64.facts
 - facts/2.3/centos-7-x86_64.facts
+- facts/2.3/oraclelinux-6-x86_64.facts
+- facts/2.3/oraclelinux-7-x86_64.facts
 - facts/2.3/redhat-6-x86_64.facts
 - facts/2.3/redhat-7-x86_64.facts
 - facts/2.4/centos-6-x86_64.facts
 - facts/2.4/centos-7-x86_64.facts
+- facts/2.4/oraclelinux-6-x86_64.facts
+- facts/2.4/oraclelinux-7-x86_64.facts
 - facts/2.4/redhat-6-x86_64.facts
 - facts/2.4/redhat-7-x86_64.facts
 - facts/2.5/centos-6-x86_64.facts
 - facts/2.5/centos-7-x86_64.facts
+- facts/2.5/oraclelinux-6-x86_64.facts
+- facts/2.5/oraclelinux-7-x86_64.facts
 - facts/2.5/redhat-6-x86_64.facts
 - facts/2.5/redhat-7-x86_64.facts
 - facts/3.0/centos-6-x86_64.facts
 - facts/3.0/centos-7-x86_64.facts
+- facts/3.0/oraclelinux-6-x86_64.facts
+- facts/3.0/oraclelinux-7-x86_64.facts
 - facts/3.0/redhat-6-x86_64.facts
 - facts/3.0/redhat-7-x86_64.facts
 - facts/3.3/centos-6-x86_64.facts
 - facts/3.3/centos-7-x86_64.facts
+- facts/3.3/oraclelinux-6-x86_64.facts
+- facts/3.3/oraclelinux-7-x86_64.facts
 - facts/3.3/redhat-6-x86_64.facts
 - facts/3.3/redhat-7-x86_64.facts
 - facts/3.4/centos-6-x86_64.facts
 - facts/3.4/centos-7-x86_64.facts
+- facts/3.4/oraclelinux-6-x86_64.facts
+- facts/3.4/oraclelinux-7-x86_64.facts
 - facts/3.4/redhat-6-x86_64.facts
 - facts/3.4/redhat-7-x86_64.facts
 - facts/3.5/centos-6-x86_64.facts
 - facts/3.5/centos-7-x86_64.facts
+- facts/3.5/oraclelinux-6-x86_64.facts
+- facts/3.5/oraclelinux-7-x86_64.facts
 - facts/3.5/redhat-6-x86_64.facts
 - facts/3.5/redhat-7-x86_64.facts
 - facts/3.6/centos-6-x86_64.facts
 - facts/3.6/centos-7-x86_64.facts
+- facts/3.6/oraclelinux-6-x86_64.facts
+- facts/3.6/oraclelinux-7-x86_64.facts
 - facts/3.6/redhat-6-x86_64.facts
 - facts/3.6/redhat-7-x86_64.facts
 - facts/3.7/centos-6-x86_64.facts
 - facts/3.7/centos-7-x86_64.facts
+- facts/3.7/oraclelinux-6-x86_64.facts
+- facts/3.7/oraclelinux-7-x86_64.facts
 - facts/3.7/redhat-6-x86_64.facts
 - facts/3.7/redhat-7-x86_64.facts
 - facts/Gemfile
@@ -182,6 +222,8 @@ files:
 - facts/scripts/gce_scrub_data.rb
 - facts/scripts/gce_scrub_data/centos-6-x86_64.scrub.yaml
 - facts/scripts/gce_scrub_data/centos-7-x86_64.scrub.yaml
+- facts/scripts/gce_scrub_data/oraclelinux-6-x86_64.scrub.yaml
+- facts/scripts/gce_scrub_data/oraclelinux-7-x86_64.scrub.yaml
 - facts/scripts/gce_scrub_data/redhat-6-x86_64.scrub.yaml
 - facts/scripts/gce_scrub_data/redhat-7-x86_64.scrub.yaml
 - facts/scripts/get_facts.rb
@@ -215,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - rspec-puppet-facts
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: standard SIMP facts fixtures for Puppet
@@ -228,54 +270,80 @@ test_files:
 - spec/spec_helper.rb
 - facts/1.7/centos-6-x86_64.facts
 - facts/1.7/centos-7-x86_64.facts
+- facts/1.7/oraclelinux-6-x86_64.facts
+- facts/1.7/oraclelinux-7-x86_64.facts
 - facts/1.7/redhat-6-x86_64.facts
 - facts/1.7/redhat-7-x86_64.facts
 - facts/2.0/centos-6-x86_64.facts
 - facts/2.0/centos-7-x86_64.facts
+- facts/2.0/oraclelinux-6-x86_64.facts
+- facts/2.0/oraclelinux-7-x86_64.facts
 - facts/2.0/redhat-6-x86_64.facts
 - facts/2.0/redhat-7-x86_64.facts
 - facts/2.1/centos-6-x86_64.facts
 - facts/2.1/centos-7-x86_64.facts
+- facts/2.1/oraclelinux-6-x86_64.facts
+- facts/2.1/oraclelinux-7-x86_64.facts
 - facts/2.1/redhat-6-x86_64.facts
 - facts/2.1/redhat-7-x86_64.facts
 - facts/2.2/centos-6-x86_64.facts
 - facts/2.2/centos-7-x86_64.facts
+- facts/2.2/oraclelinux-6-x86_64.facts
+- facts/2.2/oraclelinux-7-x86_64.facts
 - facts/2.2/redhat-6-x86_64.facts
 - facts/2.2/redhat-7-x86_64.facts
 - facts/2.3/centos-6-x86_64.facts
 - facts/2.3/centos-7-x86_64.facts
+- facts/2.3/oraclelinux-6-x86_64.facts
+- facts/2.3/oraclelinux-7-x86_64.facts
 - facts/2.3/redhat-6-x86_64.facts
 - facts/2.3/redhat-7-x86_64.facts
 - facts/2.4/centos-6-x86_64.facts
 - facts/2.4/centos-7-x86_64.facts
+- facts/2.4/oraclelinux-6-x86_64.facts
+- facts/2.4/oraclelinux-7-x86_64.facts
 - facts/2.4/redhat-6-x86_64.facts
 - facts/2.4/redhat-7-x86_64.facts
 - facts/2.5/centos-6-x86_64.facts
 - facts/2.5/centos-7-x86_64.facts
+- facts/2.5/oraclelinux-6-x86_64.facts
+- facts/2.5/oraclelinux-7-x86_64.facts
 - facts/2.5/redhat-6-x86_64.facts
 - facts/2.5/redhat-7-x86_64.facts
 - facts/3.0/centos-6-x86_64.facts
 - facts/3.0/centos-7-x86_64.facts
+- facts/3.0/oraclelinux-6-x86_64.facts
+- facts/3.0/oraclelinux-7-x86_64.facts
 - facts/3.0/redhat-6-x86_64.facts
 - facts/3.0/redhat-7-x86_64.facts
 - facts/3.3/centos-6-x86_64.facts
 - facts/3.3/centos-7-x86_64.facts
+- facts/3.3/oraclelinux-6-x86_64.facts
+- facts/3.3/oraclelinux-7-x86_64.facts
 - facts/3.3/redhat-6-x86_64.facts
 - facts/3.3/redhat-7-x86_64.facts
 - facts/3.4/centos-6-x86_64.facts
 - facts/3.4/centos-7-x86_64.facts
+- facts/3.4/oraclelinux-6-x86_64.facts
+- facts/3.4/oraclelinux-7-x86_64.facts
 - facts/3.4/redhat-6-x86_64.facts
 - facts/3.4/redhat-7-x86_64.facts
 - facts/3.5/centos-6-x86_64.facts
 - facts/3.5/centos-7-x86_64.facts
+- facts/3.5/oraclelinux-6-x86_64.facts
+- facts/3.5/oraclelinux-7-x86_64.facts
 - facts/3.5/redhat-6-x86_64.facts
 - facts/3.5/redhat-7-x86_64.facts
 - facts/3.6/centos-6-x86_64.facts
 - facts/3.6/centos-7-x86_64.facts
+- facts/3.6/oraclelinux-6-x86_64.facts
+- facts/3.6/oraclelinux-7-x86_64.facts
 - facts/3.6/redhat-6-x86_64.facts
 - facts/3.6/redhat-7-x86_64.facts
 - facts/3.7/centos-6-x86_64.facts
 - facts/3.7/centos-7-x86_64.facts
+- facts/3.7/oraclelinux-6-x86_64.facts
+- facts/3.7/oraclelinux-7-x86_64.facts
 - facts/3.7/redhat-6-x86_64.facts
 - facts/3.7/redhat-7-x86_64.facts
 - facts/Gemfile
@@ -284,6 +352,8 @@ test_files:
 - facts/scripts/gce_scrub_data.rb
 - facts/scripts/gce_scrub_data/centos-6-x86_64.scrub.yaml
 - facts/scripts/gce_scrub_data/centos-7-x86_64.scrub.yaml
+- facts/scripts/gce_scrub_data/oraclelinux-6-x86_64.scrub.yaml
+- facts/scripts/gce_scrub_data/oraclelinux-7-x86_64.scrub.yaml
 - facts/scripts/gce_scrub_data/redhat-6-x86_64.scrub.yaml
 - facts/scripts/gce_scrub_data/redhat-7-x86_64.scrub.yaml
 - facts/scripts/get_facts.rb