Slight denormalisation to store a host's environment as a first class

object in the database
Fixes: #1392

3 files changed, 14 insertions, 0 deletions

diff --git a/lib/puppet/rails/database/002_add_environment_to_host.rb b/lib/puppet/rails/database/002_add_environment_to_host.rb
new file mode 100644
index 000000000..4593a06f7
--- /dev/null
+++ b/lib/puppet/rails/database/002_add_environment_to_host.rb
@@ -0,0 +1,9 @@
+class AddEnvironmentToHost < ActiveRecord::Migration
+    def self.up
+        add_column :hosts, :environment, :string
+    end
+    
+    def self.down
+        remove_column :hosts, :environment
+    end
+end
diff --git a/lib/puppet/rails/database/schema.rb b/lib/puppet/rails/database/schema.rb
index f3ad2c11e..246bec482 100644
--- a/lib/puppet/rails/database/schema.rb
+++ b/lib/puppet/rails/database/schema.rb
@@ -54,6 +54,7 @@ class Puppet::Rails::Schema
                 create_table :hosts do |t|
                     t.column :name, :string, :null => false
                     t.column :ip, :string
+                    t.column :environment, :string
                     t.column :last_compile, :datetime
                     t.column :last_freshcheck, :datetime
                     t.column :last_report, :datetime
diff --git a/lib/puppet/rails/host.rb b/lib/puppet/rails/host.rb
index 626edaa88..187dc657a 100644
--- a/lib/puppet/rails/host.rb
+++ b/lib/puppet/rails/host.rb
@@ -43,6 +43,10 @@ class Puppet::Rails::Host < ActiveRecord::Base
                 host.ip = ip
             end
 
+            if env = node.environment
+                host.environment = env
+            end
+
             # Store the facts into the database.
             host.setfacts node.parameters