foreman_salt 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbf372535a8e277e4a1fd65d32271fa7b26b1e31
-  data.tar.gz: dea79e99a14a254b5550cfd7aa73ba1b2c27034a
+  metadata.gz: 2e2b2790368b1ac4ecfb5b3fcd19bfcdb0274acc
+  data.tar.gz: 987a376ba11c90087cee57d7fed8c824c3465fe7
 SHA512:
-  metadata.gz: c5ae749eac1dfcdf696ff34cfb12c1b816ece02b047eef2c9c8e7836bd7b0b1b9a1b98e4d8f3ff0341046dbf287f60ac665d178ef7488b92c6cf7e927f9012ab
-  data.tar.gz: cf6e273a09c29a1208ce0752acf58db2fff6d47f270866b3c97d956a57c71cf6e55e94040938f517bbc00c84b30d30fe52615762a3e16b11e4c3b930614f4cd3
+  metadata.gz: 8f505bfe69b144df567bebed2b5ae9c188ded36f39ac3bce3bf5801a8856c26f53724bac9f3dd5fddeafb82c76d66455886531354882a56da5a9f35075bffc2c
+  data.tar.gz: 23ba6cec5f63d40124c02ba81b4aabb4e272ae87ce6939d625c1dc9f1db53424a667f8f8eee224ba4a71e3f43caadd0af57ade326092df3a16d8bab0f3ad0a39

data/app/controllers/foreman_salt/concerns/hosts_controller_extensions.rb

@@ -24,10 +24,12 @@ module ForemanSalt
         begin
           @host = resource_base.find_by_name(params[:name])
           enc = {}
+          env = @host.salt_environment.blank? ? 'base' : @host.salt_environment
           enc["classes"] = @host.salt_modules.any? ? @host.salt_modules.map(&:name) : []
           enc["parameters"] = @host.info["parameters"]
+          enc["environment"] = env
           respond_to do |format|
-            format.html { render :text => "<pre>#{ERB::Util.html_escape(enc.to_yaml)}</pre>" } 
+            format.html { render :text => "<pre>#{ERB::Util.html_escape(enc.to_yaml)}</pre>" }
             format.yml  { render :text => enc.to_yaml }
           end
         rescue
@@ -40,7 +42,7 @@ module ForemanSalt
         @hostgroup = Hostgroup.find(params[:host][:hostgroup_id]) if params[:host][:hostgroup_id].to_i > 0
         return head(:not_found) unless @hostgroup
 
-        @salt_modules           = @host.salt_modules if @host 
+        @salt_modules           = @host.salt_modules if @host
         @inherited_salt_modules = @hostgroup.salt_modules
         process_hostgroup_without_salt_modules
       end
@@ -60,7 +62,7 @@ module ForemanSalt
 
       def load_vars_for_ajax_with_salt_modules
         return unless @host
-        @salt_modules           = @host.salt_modules 
+        @salt_modules           = @host.salt_modules
         @inherited_salt_modules = @host.hostgroup.salt_modules if @host.hostgroup
         load_vars_for_ajax_without_salt_modules
       end

data/app/controllers/foreman_salt/salt_environments_controller.rb

@@ -0,0 +1,45 @@
+module ForemanSalt
+  class SaltEnvironmentsController < ::ApplicationController
+    include Foreman::Controller::AutoCompleteSearch
+
+    before_filter :find_by_name, :only => [:edit, :update, :destroy]
+
+    def index
+      @salt_environments = resource_base.search_for(params[:search], :order => params[:order]).paginate(:page => params[:page])
+    end
+
+    def new
+      @salt_environment = SaltEnvironment.new
+    end
+
+    def create
+      logger.info("Params: #{params.inspect}")
+      @salt_environment = SaltEnvironment.new(params[:foreman_salt_salt_environment])
+      if @salt_environment.save
+        process_success
+      else
+        process_error
+      end
+    end
+
+    def edit
+    end
+
+    def update
+      if @salt_environment.update_attributes(params[:foreman_salt_salt_environment])
+        notice _("Successfully updated %s." % @salt_environment.to_s)
+        redirect_to salt_environments_path
+      else
+        process_error
+      end
+    end
+
+    def destroy
+      if @salt_environment.destroy
+        process_success
+      else
+        process_error
+      end
+    end
+  end
+end

data/app/models/concerns/foreman_salt/host_managed_extensions.rb

@@ -5,6 +5,7 @@ module ForemanSalt
     included do
       has_and_belongs_to_many :salt_modules, :class_name => "ForemanSalt::SaltModule", :join_table => "hosts_salt_modules", :foreign_key => "host_id"
       belongs_to :salt_proxy, :class_name => "SmartProxy"
+      belongs_to :salt_environment, :class_name => "ForemanSalt::SaltEnvironment"
       alias_method_chain :params, :salt_proxy
       alias_method_chain :set_hostgroup_defaults, :salt_proxy
       alias_method_chain :smart_proxy_ids, :salt_proxy

data/app/models/concerns/foreman_salt/hostgroup_extensions.rb

@@ -5,6 +5,7 @@ module ForemanSalt
     included do
       has_and_belongs_to_many :salt_modules, :class_name => "ForemanSalt::SaltModule"
       belongs_to :salt_proxy, :class_name => "SmartProxy"
+      belongs_to :salt_environment, :class_name => "ForemanSalt::SaltEnvironment"
     end
 
     def salt_modules
@@ -42,6 +43,19 @@ module ForemanSalt
       end
     end
 
+    def salt_environment
+      return super unless ancestry.present?
+      ForemanSalt::SaltEnvironment.find_by_id(inherited_salt_environment_id)
+    end
+
+    def inherited_salt_environment_id
+      if ancestry.present?
+        read_attribute(:salt_environment_id) || self.class.sort_by_ancestry(ancestors.where("salt_environment_id is not NULL")).last.try(:salt_environment_id)
+      else
+        self.salt_environment_id
+      end
+    end
+
     def salt_master
       salt_proxy.to_s
     end

data/app/models/concerns/foreman_salt/orchestration/salt.rb

@@ -34,6 +34,7 @@ module ForemanSalt
       end
 
       def queue_salt_destroy
+        return unless salt? && errors.empty?
         queue.create(:name => _("Remove autosign entry for %s") % self, :priority => 50, :action => [self, :salt_autosign_remove])
         queue.create(:name => _("Delete existing salt key for %s") % self, :priority => 50, :action => [self, :salt_key_delete])
       end
@@ -49,7 +50,7 @@ module ForemanSalt
         salt_key_delete # if there's already an existing key
         @salt_api.autosign_create name
       rescue => e
-        failure _("Failed to create %{name}'s Salt autosign entry: %{e}") % { :name => name, :e => proxy_error(e) }
+        failure _("Failed to create %{name}'s Salt autosign entry: %{e}") % { :name => name, :e => e }
       end
 
       def salt_autosign_remove
@@ -57,7 +58,7 @@ module ForemanSalt
         initialize_salt
         @salt_api.autosign_remove name
       rescue => e
-        failure _("Failed to remove %{name}'s Salt autosign entry: %{e}") % { :name => name, :e => proxy_error(e) }
+        failure _("Failed to remove %{name}'s Salt autosign entry: %{e}") % { :name => name, :e => e }
       end
 
       def salt_key_delete
@@ -65,7 +66,7 @@ module ForemanSalt
         initialize_salt
         @salt_api.key_delete name
       rescue => e
-        failure _("Failed to delete %{name}'s Salt key: %{e}") % { :name => name, :e => proxy_error(e) }
+        failure _("Failed to delete %{name}'s Salt key: %{e}") % { :name => name, :e => e }
       end
     end
   end

data/app/models/foreman_salt/salt_environment.rb

@@ -0,0 +1,21 @@
+module ForemanSalt
+  class SaltEnvironment < ActiveRecord::Base
+    include Taxonomix
+    include Authorizable
+
+    before_destroy EnsureNotUsedBy.new(:hosts, :hostgroups)
+
+    has_many :hosts, :class_name => "::Host::Managed"
+    has_many :hostgroups, :class_name => "::Hostgroup"
+
+    validates :name, :uniqueness => true, :presence => true, :format => { :with => /\A[\w\d\.]+\z/, :message => N_("is alphanumeric and cannot contain spaces") }
+
+    default_scope lambda {
+      order("salt_environments.name")
+    }
+
+    scoped_search :on => :name, :complete_value => true
+    scoped_search :in => :hostgroups, :on => :name, :complete_value => true, :rename => :hostgroup
+    scoped_search :in => :hosts, :on => :name, :complete_value => true, :rename => :host
+  end
+end

data/app/models/foreman_salt/salt_module.rb

@@ -9,7 +9,7 @@ module ForemanSalt
 
     has_and_belongs_to_many :hostgroups, :class_name => "::Hostgroup", :join_table => "hostgroups_salt_modules"
 
-    validates :name, :uniqueness => true, :presence => true, :format => { :with => /\A[\w\d]+\z/, :message => N_("is alphanumeric and cannot contain spaces") }
+    validates :name, :uniqueness => true, :presence => true, :format => { :with => /\A(?:[\w\d]+\.{0,1})+[^\.]\z/, :message => N_("must be alphanumeric, can contain dots and must not contain spaces") }
 
     default_scope lambda {
       order("salt_modules.name")

data/app/overrides/foreman/salt_modules/_host_tab.html.erb

@@ -1,2 +1,2 @@
-<li><a href="#salt_modules" data-toggle="tab"><%= _('Salt Modules') %></a></li>
+<li><a href="#salt_modules" data-toggle="tab"><%= _('Salt States') %></a></li>
 

data/app/overrides/foreman/salt_modules/_host_tab_pane.html.erb

@@ -2,7 +2,7 @@
 <div class="tab-pane" id="salt_modules">
   <div class="row">
     <div class="col-md-4">
-       <h3>Inherited Modules</h3>
+       <h3>Inherited States</h3>
        <ul>
        <% @inherited_salt_modules.sort.each do |salt_module| -%>
          <li title="Inherited from hostgroup"><%= salt_module.name -%></li>
@@ -10,7 +10,7 @@
        </ul>
      </div>
      <div class="col-md-8">
-       <h3>Salt Modules</h3>
+       <h3>Salt States</h3>
        <% if @inherited_salt_modules.blank? -%>
          <%= multiple_selects f, :salt_module, ::ForemanSalt::SaltModule, @salt_modules.try(:map, &:id), :label => "" %>
        <% else -%>

data/app/overrides/salt_environment_selector.rb

@@ -0,0 +1,13 @@
+selector_text = "<%= select_f f, :salt_environment_id, ForemanSalt::SaltEnvironment.all, :id, :name,
+                                 { :include_blank => blank_or_inherit_f(f, :salt_environment) },
+                                 { :label         => _('Salt Environment') } %>"
+
+Deface::Override.new(:virtual_path  => "hosts/_form",
+                     :name          => "add_salt_environment_to_host",
+                     :insert_bottom => 'div#primary',
+                     :text          =>  selector_text)
+
+Deface::Override.new(:virtual_path  => "hostgroups/_form",
+                     :name          => "add_salt_environment_to_hostgroup",
+                     :insert_bottom => 'div#primary',
+                     :text          =>  selector_text)

data/app/views/foreman_salt/salt_environments/_form.html.erb

@@ -0,0 +1,15 @@
+<%= form_for @salt_environment, :url => (@salt_environment.new_record? ? salt_environments_path : salt_environment_path(:id => @salt_environment.id)) do |f| %>
+  <%= base_errors_for @salt_environment %>
+  <ul class="nav nav-tabs" data-tabs="tabs">
+    <li class="active"><a href="#primary" data-toggle="tab"><%= _('Salt Environments') %></a></li>
+  </ul>
+
+  <div class="tab-content">
+    <div class="tab-pane active" id="primary">
+      <%= text_f f, :name %>
+    </div>
+  </div>
+
+  <%= submit_or_cancel f %>
+<% end %>
+

data/app/views/foreman_salt/salt_environments/edit.html.erb

@@ -0,0 +1,4 @@
+<% title(_("Edit Salt Environment %s") % @salt_environment) %>
+
+<%= render :partial => 'form' %>
+

data/app/views/foreman_salt/salt_environments/index.html.erb

@@ -0,0 +1,23 @@
+<% title _("Salt Environments") %>
+
+<% title_actions button_group(display_link_if_authorized(_("New Salt Environment"), hash_for_new_salt_environment_path)) %>
+
+<table class="table table-bordered table-striped">
+  <tr>
+    <th><%= sort :name, :as => s_("SaltEnvironment|Name") %></th>
+    <th></th>
+  </tr>
+  <% for salt_environment in @salt_environments %>
+    <tr>
+      <td><%=link_to_if_authorized h(salt_environment.name), hash_for_edit_salt_environment_path(:id => salt_environment).merge(:auth_object => salt_environment, :authorizer => authorizer) %></td>
+      <td>
+        <%= action_buttons(display_delete_if_authorized hash_for_salt_environment_path(:id => salt_environment).merge(:auth_object => salt_environment, :authorizer => authorizer),
+                            :confirm => _("Delete %s?") % salt_environment.name) %>
+      </td>
+    </tr>
+  <% end %>
+</table>
+
+<%= page_entries_info @salt_environments %>
+<%= will_paginate @salt_environments %>
+

data/app/views/foreman_salt/salt_environments/new.html.erb

@@ -0,0 +1,4 @@
+<% title _("New Salt Environment") %>
+
+<%= render :partial => 'form' %>
+

data/app/views/foreman_salt/salt_modules/_form.html.erb

@@ -1,7 +1,7 @@
 <%= form_for @salt_module, :url => (@salt_module.new_record? ? salt_modules_path : salt_module_path(:id => @salt_module.id)) do |f| %>
   <%= base_errors_for @salt_module %>
   <ul class="nav nav-tabs" data-tabs="tabs">
-    <li class="active"><a href="#primary" data-toggle="tab"><%= _('Salt Modules') %></a></li>
+    <li class="active"><a href="#primary" data-toggle="tab"><%= _('Salt States') %></a></li>
   </ul>
 
   <div class="tab-content">

data/app/views/foreman_salt/salt_modules/edit.html.erb

@@ -1,4 +1,4 @@
-<% title(_("Edit Salt Module %s") % @salt_module) %>
+<% title(_("Edit Salt State %s") % @salt_module) %>
 
 <%= render :partial => 'form' %>
 

data/app/views/foreman_salt/salt_modules/index.html.erb

@@ -1,6 +1,6 @@
-<% title _("Salt modules") %>
+<% title _("Salt States") %>
 
-<% title_actions button_group(display_link_if_authorized(_("New Salt module"), hash_for_new_salt_module_path)) %>
+<% title_actions button_group(display_link_if_authorized(_("New Salt State"), hash_for_new_salt_module_path)) %>
 
 <table class="table table-bordered table-striped">
   <tr>

data/app/views/foreman_salt/salt_modules/new.html.erb

@@ -1,4 +1,4 @@
-<% title _("New Salt module") %>
+<% title _("New Salt State") %>
 
 <%= render :partial => 'form' %>
 

data/config/routes.rb

@@ -3,7 +3,13 @@ Rails.application.routes.draw do
   scope :salt, :path => '/salt' do
     match "/node/:name" => 'hosts#salt_external_node', :constraints => { :name => /[^\.][\w\.-]+/ }
 
-    resources :salt_modules, :controller => 'foreman_salt/salt_modules' do 
+    resources :salt_environments, :controller => 'foreman_salt/salt_environments' do
+      collection do
+        get 'auto_complete_search'
+      end
+    end
+
+    resources :salt_modules, :controller => 'foreman_salt/salt_modules' do
       collection do
         get 'auto_complete_search'
       end

data/db/migrate/20140920232200_create_salt_environments.rb

@@ -0,0 +1,19 @@
+class CreateSaltEnvironments < ActiveRecord::Migration
+  def self.up
+    create_table :salt_environments do |t|
+      t.string :name, :default => "", :null => false
+      t.timestamps
+    end
+
+    add_column :hosts, :salt_environment_id, :integer
+    add_column :hostgroups, :salt_environment_id, :integer
+
+    add_index :salt_environments, :name, :unique => true
+  end
+
+  def self.down
+    remove_column :hosts, :salt_environment_id
+    remove_column :hostgroups, :salt_environment_id
+    drop_table :salt_environments
+  end
+end

data/lib/foreman_salt/engine.rb

@@ -19,9 +19,15 @@ module ForemanSalt
       Foreman::Plugin.register :foreman_salt do
         requires_foreman '>= 1.6'
 
-        menu :top_menu, :salt,
+        menu :top_menu, :salt_environments,
+          :url_hash => {:controller => :'foreman_salt/salt_environments', :action => :index },
+          :caption  => 'Environments',
+          :parent   => :configure_menu,
+          :after    => :common_parameters
+
+        menu :top_menu, :salt_modules,
           :url_hash => {:controller => :'foreman_salt/salt_modules', :action => :index },
-          :caption  => 'Modules',
+          :caption  => 'States',
           :parent   => :configure_menu,
           :after    => :common_parameters
 
@@ -34,6 +40,13 @@ module ForemanSalt
           permission :view_hosts, {:hosts => [:salt_external_node]}, :resource_type => 'Host'
         end
 
+        security_block :salt_environments do |map|
+          permission :create_salt_environments, {:'foreman_salt/salt_environments' => [:new, :create]}, :resource_type => "ForemanSalt::SaltEnvironment"
+          permission :view_salt_environments, {:'foreman_salt/salt_environments' => [:index, :show, :auto_complete_search]}, :resource_type => "ForemanSalt::SaltEnvironment"
+          permission :edit_salt_environments, {:'foreman_salt/salt_environments' => [:update, :edit]},:resource_type => "ForemanSalt::SaltEnvironment"
+          permission :destroy_salt_environments, {:'foreman_salt/salt_environments' => [:destroy]}, :resource_type => "ForemanSalt::SaltEnvironment"
+        end
+
         security_block :salt_modules do |map|
           permission :create_salt_modules, {:'foreman_salt/salt_modules' => [:new, :create]}, :resource_type => "ForemanSalt::SaltModule"
           permission :view_salt_modules, {:'foreman_salt/salt_modules' => [:index, :show, :auto_complete_search]}, :resource_type => "ForemanSalt::SaltModule"
@@ -54,9 +67,10 @@ module ForemanSalt
         end
 
         role "Salt admin", [:saltrun_hosts, :create_salt_modules, :view_salt_modules, :edit_salt_modules, :destroy_salt_modules,
-                            :view_smart_proxies_salt_keys, :destroy_smart_proxies_salt_keys, :edit_smart_proxies_salt_keys, 
-                            :create_smart_proxies_salt_autosign, :view_smart_proxies_salt_autosign, :destroy_smart_proxies_salt_autosign]
-        
+                            :view_smart_proxies_salt_keys, :destroy_smart_proxies_salt_keys, :edit_smart_proxies_salt_keys,
+                            :create_smart_proxies_salt_autosign, :view_smart_proxies_salt_autosign, :destroy_smart_proxies_salt_autosign,
+                            :create_salt_environments, :view_salt_environments, :edit_salt_environments, :destroy_salt_environments]
+
       end
     end
 

data/lib/foreman_salt/version.rb

@@ -1,3 +1,3 @@
 module ForemanSalt
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/integration/salt_environment_test.rb

@@ -0,0 +1,27 @@
+require 'test_plugin_helper'
+
+module ForemanSalt
+  class SaltEnvironmentTest < ActionDispatch::IntegrationTest
+
+    test "index page" do
+      FactoryGirl.create_list :salt_environment, 50
+      assert_index_page(salt_environments_path, "Salt Environment", "New Salt Environment")
+    end
+
+    test "create new page" do
+      assert_new_button(salt_environments_path, "New Salt Environment", new_salt_environment_path)
+      fill_in "foreman_salt_salt_environment_name", :with => "common"
+      assert_submit_button(salt_environments_path)
+      assert page.has_link? 'common'
+    end
+
+    test "edit page" do
+      salt_environment = FactoryGirl.create :salt_environment
+      visit salt_environments_path
+      click_link salt_environment.name
+      fill_in "foreman_salt_salt_environment_name", :with => "some_other_name"
+      assert_submit_button(salt_environments_path)
+      assert page.has_link? 'some_other_name'
+    end
+  end
+end

data/test/integration/salt_module_test.rb

@@ -5,11 +5,11 @@ module ForemanSalt
 
     test "index page" do
       FactoryGirl.create_list :salt_module, 50
-      assert_index_page(salt_modules_path, "Salt modules", "New Salt module")
+      assert_index_page(salt_modules_path, "Salt State", "New Salt State")
     end
 
     test "create new page" do
-      assert_new_button(salt_modules_path, "New Salt module", new_salt_module_path)
+      assert_new_button(salt_modules_path, "New Salt State", new_salt_module_path)
       fill_in "foreman_salt_salt_module_name", :with => "common"
       assert_submit_button(salt_modules_path)
       assert page.has_link? 'common'

data/test/unit/salt_modules_test.rb

@@ -0,0 +1,17 @@
+require 'test_plugin_helper'
+
+class SaltKeysTest < ActiveSupport::TestCase
+  setup do
+    User.current = User.find_by_login "admin"
+  end
+
+  test "salt module has a valid name" do
+    salt_module = ForemanSalt::SaltModule.new(:name => 'foo.bar.baz')
+    assert_valid salt_module
+  end
+
+  test "salt module has invalid name" do
+    salt_module = ForemanSalt::SaltModule.new(:name => "&bad$name")
+    refute_valid salt_module, :name, /alphanumeric/
+  end
+end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: foreman_salt
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Stephen Benjamin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-31 00:00:00.000000000 Z
+date: 2014-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Foreman Plug-in for Salt
@@ -31,59 +31,69 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/helpers/foreman_salt/salt_keys_helper.rb
-- app/helpers/concerns/foreman_salt/smart_proxies_helper_extensions.rb
+- LICENSE
+- README.md
+- Rakefile
+- app/controllers/foreman_salt/concerns/hostgroups_controller_extensions.rb
+- app/controllers/foreman_salt/concerns/hosts_controller_extensions.rb
+- app/controllers/foreman_salt/concerns/smart_proxy_auth_extensions.rb
+- app/controllers/foreman_salt/concerns/unattended_controller_extensions.rb
+- app/controllers/foreman_salt/salt_autosign_controller.rb
+- app/controllers/foreman_salt/salt_environments_controller.rb
+- app/controllers/foreman_salt/salt_keys_controller.rb
+- app/controllers/foreman_salt/salt_modules_controller.rb
 - app/helpers/concerns/foreman_salt/hosts_helper_extensions.rb
-- app/overrides/salt_modules_selector.rb
+- app/helpers/concerns/foreman_salt/smart_proxies_helper_extensions.rb
+- app/helpers/foreman_salt/salt_keys_helper.rb
+- app/lib/proxy_api/salt.rb
+- app/models/concerns/foreman_salt/host_managed_extensions.rb
+- app/models/concerns/foreman_salt/hostgroup_extensions.rb
+- app/models/concerns/foreman_salt/orchestration/salt.rb
+- app/models/foreman_salt/fact_name.rb
+- app/models/foreman_salt/salt_environment.rb
+- app/models/foreman_salt/salt_module.rb
 - app/overrides/foreman/salt_modules/_host_tab.html.erb
 - app/overrides/foreman/salt_modules/_host_tab_pane.html.erb
+- app/overrides/salt_environment_selector.rb
+- app/overrides/salt_modules_selector.rb
 - app/overrides/salt_proxy_selector.rb
-- app/views/foreman_salt/salt_modules/index.html.erb
-- app/views/foreman_salt/salt_modules/new.html.erb
-- app/views/foreman_salt/salt_modules/_form.html.erb
-- app/views/foreman_salt/salt_modules/edit.html.erb
-- app/views/foreman_salt/salt_keys/index.erb
+- app/services/foreman_salt/fact_importer.rb
+- app/services/foreman_salt/smart_proxies/salt_keys.rb
+- app/views/foreman_salt/salt_autosign/_form.html.erb
 - app/views/foreman_salt/salt_autosign/index.html.erb
 - app/views/foreman_salt/salt_autosign/new.html.erb
-- app/views/foreman_salt/salt_autosign/_form.html.erb
-- app/services/foreman_salt/smart_proxies/salt_keys.rb
-- app/services/foreman_salt/fact_importer.rb
-- app/models/foreman_salt/salt_module.rb
-- app/models/foreman_salt/fact_name.rb
-- app/models/concerns/foreman_salt/hostgroup_extensions.rb
-- app/models/concerns/foreman_salt/host_managed_extensions.rb
-- app/models/concerns/foreman_salt/orchestration/salt.rb
-- app/controllers/foreman_salt/salt_modules_controller.rb
-- app/controllers/foreman_salt/salt_autosign_controller.rb
-- app/controllers/foreman_salt/salt_keys_controller.rb
-- app/controllers/foreman_salt/concerns/hostgroups_controller_extensions.rb
-- app/controllers/foreman_salt/concerns/smart_proxy_auth_extensions.rb
-- app/controllers/foreman_salt/concerns/hosts_controller_extensions.rb
-- app/controllers/foreman_salt/concerns/unattended_controller_extensions.rb
-- app/lib/proxy_api/salt.rb
+- app/views/foreman_salt/salt_environments/_form.html.erb
+- app/views/foreman_salt/salt_environments/edit.html.erb
+- app/views/foreman_salt/salt_environments/index.html.erb
+- app/views/foreman_salt/salt_environments/new.html.erb
+- app/views/foreman_salt/salt_keys/index.erb
+- app/views/foreman_salt/salt_modules/_form.html.erb
+- app/views/foreman_salt/salt_modules/edit.html.erb
+- app/views/foreman_salt/salt_modules/index.html.erb
+- app/views/foreman_salt/salt_modules/new.html.erb
 - config/routes.rb
-- db/seeds.d/75-salt-seeds.rb
+- db/migrate/20140813081913_add_salt_proxy_to_host_and_host_group.rb
 - db/migrate/20140817210214_create_salt_modules.rb
 - db/migrate/20140829210214_add_salt_modules_to_hostgroups.rb
-- db/migrate/20140813081913_add_salt_proxy_to_host_and_host_group.rb
+- db/migrate/20140920232200_create_salt_environments.rb
+- db/seeds.d/75-salt-seeds.rb
+- lib/foreman_salt.rb
 - lib/foreman_salt/engine.rb
 - lib/foreman_salt/version.rb
 - lib/tasks/foreman_salt_tasks.rake
-- lib/foreman_salt.rb
-- LICENSE
-- Rakefile
-- README.md
+- test/factories/foreman_salt_factories.rb
+- test/functional/hosts_controller_test.rb
+- test/integration/salt_autosign_test.rb
+- test/integration/salt_environment_test.rb
 - test/integration/salt_keys_test.rb
 - test/integration/salt_module_test.rb
-- test/integration/salt_autosign_test.rb
-- test/unit/salt_keys_test.rb
+- test/test_plugin_helper.rb
 - test/unit/grains_centos.json
-- test/unit/host_extensions_test.rb
 - test/unit/grains_importer_test.rb
+- test/unit/host_extensions_test.rb
 - test/unit/hostgroup_extensions_test.rb
-- test/test_plugin_helper.rb
-- test/factories/foreman_salt_factories.rb
-- test/functional/hosts_controller_test.rb
+- test/unit/salt_keys_test.rb
+- test/unit/salt_modules_test.rb
 homepage: http://github.com/theforeman/foreman_salt
 licenses:
 - GPL-3
@@ -94,29 +104,31 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Foreman Plug-in for Salt
 test_files:
-- test/integration/salt_keys_test.rb
-- test/integration/salt_module_test.rb
-- test/integration/salt_autosign_test.rb
-- test/unit/salt_keys_test.rb
-- test/unit/grains_centos.json
+- test/factories/foreman_salt_factories.rb
 - test/unit/host_extensions_test.rb
+- test/unit/salt_keys_test.rb
 - test/unit/grains_importer_test.rb
 - test/unit/hostgroup_extensions_test.rb
-- test/test_plugin_helper.rb
-- test/factories/foreman_salt_factories.rb
+- test/unit/salt_modules_test.rb
+- test/unit/grains_centos.json
 - test/functional/hosts_controller_test.rb
+- test/integration/salt_autosign_test.rb
+- test/integration/salt_keys_test.rb
+- test/integration/salt_environment_test.rb
+- test/integration/salt_module_test.rb
+- test/test_plugin_helper.rb