Merge branch 'ticket/2.6.next/6338' into 2.6.next

* ticket/2.6.next/6338:
  (#5150) Make fact REST terminus configurable to connect to inventory service
  (#5166) Inventory service is now searchable by timestamp.
  Maint: backport timestamp accessor for facts from 2.7 branch
  Refactored Puppet::Node::Inventory::Yaml tests in preparation for adding freshness check
  Refactor Puppet::Node::Inventory::Yaml in preparation for adding freshness
  (#5132) Provide a query REST interface for inventory

2 files changed, 15 insertions, 0 deletions

diff --git a/lib/puppet/node/facts.rb b/lib/puppet/node/facts.rb
index b77ad22d5..562690026 100755
--- a/lib/puppet/node/facts.rb
+++ b/lib/puppet/node/facts.rb
@@ -54,6 +54,14 @@ class Puppet::Node::Facts
     strip_internal == other.send(:strip_internal)
   end
 
+  def timestamp=(time)
+    self.values[:_timestamp] = time
+  end
+
+  def timestamp
+    self.values[:_timestamp]
+  end
+
   private
 
   # Add internal data to the facts for storage.
diff --git a/lib/puppet/node/inventory.rb b/lib/puppet/node/inventory.rb
new file mode 100644
index 000000000..fd99163b0
--- /dev/null
+++ b/lib/puppet/node/inventory.rb
@@ -0,0 +1,7 @@
+require 'puppet/node'
+require 'puppet/indirector'
+
+class Puppet::Node::Inventory
+  extend Puppet::Indirector
+  indirects :inventory, :terminus_setting => :inventory_terminus
+end