Merge branch '2.6.x' into next

    * 2.6.x: (36 commits)
      Updated CHANGELOG for 2.6.7rc1
      (#5073) Download plugins even if you're filtering on tags
      Fix #5610: Prevent unnecessary RAL lookups
      Revert "Merge branch 'ticket/2.6.x/5605' of git://github.com/stschulte/puppet into 2.6.next"
      (#6723) Fix withenv environment restoration bug
      (#6689) Remove extraneous include of Puppet::Util in InventoryActiveRecord
      Remove extra trailing whitespace from lib/puppet/resource.rb
      (#5428) More fully "stub" Puppet::Resource::Reference for use with storedconfigs
      (#6707) Fix typo in rest_authconfig.rb
      (#6689) Make inventory_active_record terminus search quickly
      (#5392) Give a better error when realizing a non-existant resource
      (#2645) Adding a less-stubby test to verify the "system" attribute's behavior
      Update CHANGELOG for 2.6.6
      maint: Remove serialization of InventoryFact values
      maint: Rename InventoryHost to InventoryNode
      Fixed #2645 - Added support for creating system users
      maint: Remove spec run noise
      maint:Refactor of mount provider integration tests
      (#6338) Support searching on metadata in InventoryActiveRecord terminus
      (#6338) Implement search for InventoryActiveRecord facts terminus
      ...

    This merge includes essentially reverting #4904's change to the mount
    type since tests that came in from 2.6.x specified different
    behavior and what's correct is not clear to me.  I've reopened #4904 and
    added it to our backlog, and talked to Nigel about the RFC that's
    currently out on the puppet-users mailing list for a bigger refactor of
    how the mount provider works.

    Manually Resolved Conflicts:
        spec/spec_helper.rb
        spec/unit/indirector/queue_spec.rb

2 files changed, 53 insertions, 0 deletions

diff --git a/lib/puppet/rails/database/004_add_inventory_service_tables.rb b/lib/puppet/rails/database/004_add_inventory_service_tables.rb
new file mode 100644
index 000000000..6e6b28c0c
--- /dev/null
+++ b/lib/puppet/rails/database/004_add_inventory_service_tables.rb
@@ -0,0 +1,36 @@
+class AddInventoryServiceTables < ActiveRecord::Migration
+  def self.up
+    unless ActiveRecord::Base.connection.tables.include?("inventory_nodes")
+      create_table :inventory_nodes do |t|
+        t.column :name, :string, :null => false
+        t.column :timestamp, :datetime, :null => false
+        t.column :updated_at, :datetime
+        t.column :created_at, :datetime
+      end
+
+      add_index :inventory_nodes, :name, :unique => true
+    end
+
+    unless ActiveRecord::Base.connection.tables.include?("inventory_facts")
+      create_table :inventory_facts, :id => false do |t|
+        t.column :node_id, :integer, :null => false
+        t.column :name, :string, :null => false
+        t.column :value, :text, :null => false
+      end
+
+      add_index :inventory_facts, [:node_id, :name], :unique => true
+    end
+  end
+
+  def self.down
+    unless ActiveRecord::Base.connection.tables.include?("inventory_nodes")
+      remove_index :inventory_nodes, :name
+      drop_table :inventory_nodes
+    end
+
+    if ActiveRecord::Base.connection.tables.include?("inventory_facts")
+      remove_index :inventory_facts, [:node_id, :name]
+      drop_table :inventory_facts
+    end
+  end
+end
diff --git a/lib/puppet/rails/database/schema.rb b/lib/puppet/rails/database/schema.rb
index 8b389d773..7b75f4216 100644
--- a/lib/puppet/rails/database/schema.rb
+++ b/lib/puppet/rails/database/schema.rb
@@ -103,6 +103,23 @@ class Puppet::Rails::Schema
           t.column :created_at, :datetime
         end
         add_index :param_names, :name
+
+        create_table :inventory_nodes do |t|
+          t.column :name, :string, :null => false
+          t.column :timestamp, :datetime, :null => false
+          t.column :updated_at, :datetime
+          t.column :created_at, :datetime
+        end
+
+        add_index :inventory_nodes, :name, :unique => true
+
+        create_table :inventory_facts, :id => false do |t|
+          t.column :node_id, :integer, :null => false
+          t.column :name, :string, :null => false
+          t.column :value, :text, :null => false
+        end
+
+        add_index :inventory_facts, [:node_id, :name], :unique => true
       end
     end
   ensure