foreman_chef 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5548655ef04945387de4f731e48299605e51112f
-  data.tar.gz: 4580383d50804a8a876eb1d71193c5fcbacd6b52
+  metadata.gz: 7da1a055be91131a483a56eb8769bf6fafe304b9
+  data.tar.gz: 2375b6891121651e6824fff3e73e8ec38261a437
 SHA512:
-  metadata.gz: 69faf9ce712b4f2e51d81221f8e99f2b02d835d67d297e459876af7e7d7d10d2a6e0a38e4378062fc2337a03126169c5d65254206d7ce4b851b6c8d02058371d
-  data.tar.gz: 1d5e194fa1e2033f1e325b46eb19eccf89f66bdef3826841e6f8f17d5b5285580a5400832ec17fa0d880cb8b180ef81f5fe67f9dbc29eb0d216bd292a88e2def
+  metadata.gz: f6e44141df5a607f79c380b3ca81ded67314e4eb6553e6e7b262b666915b0bee84442003e44cdaf8a20f34a230eba1230dc0948dab4157012ba1660e69e26dc4
+  data.tar.gz: efd17ea55ffb24fb2ae0067f023d9fa4f029aca65a85008ddd57e427710b57f78c3481f3d72cf8ec18608864a26f5b2961af3041cbe7d0bf0e8e98020638928a

data/app/assets/javascripts/chef_proxy_environment_refresh.js

@@ -0,0 +1,26 @@
+$(function () {
+  $("#host_chef_proxy_id, #hostgroup_chef_proxy_id").change(function () {
+    var element = $(this);
+    var attrs = attribute_hash(['chef_proxy_id']);
+    var url = element.attr('data-url');
+    if (element.attr('id') == 'host_chef_proxy_id') {
+      attrs['type'] = 'host'
+    } else {
+      attrs['type'] = 'hostgroup'
+    }
+
+    foreman.tools.showSpinner();
+    $.ajax({
+      data: attrs,
+      type: 'get',
+      url: url,
+      complete: function () {
+        reloadOnAjaxComplete(element);
+      },
+      success: function (request) {
+        $('#host_chef_environment_id, #hostgroup_chef_environment_id').parent().parent().replaceWith(request);
+      }
+    });
+  });
+});
+

data/app/controllers/foreman_chef/application_controller.rb

@@ -0,0 +1,7 @@
+module ForemanChef
+  class ApplicationController < ::ApplicationController
+    def resource_class
+      "::ForemanChef::#{controller_name.singularize.classify}".constantize
+    end
+  end
+end

data/app/controllers/foreman_chef/environments_controller.rb

@@ -0,0 +1,90 @@
+module ForemanChef
+  class EnvironmentsController < ::ForemanChef::ApplicationController
+    include Foreman::Controller::AutoCompleteSearch
+    before_filter :find_resource, :only => [:edit, :update, :destroy]
+
+    def import
+      proxy = SmartProxy.authorized(:view_smart_proxies).find(params[:proxy])
+      opts = params[:proxy].blank? ? {} : { :url => proxy.url, :chef_proxy => proxy }
+      opts[:env] = params[:env] unless params[:env].blank?
+      @importer = ChefServerImporter.new(opts)
+      @changed = @importer.changes
+      if @changed.values.all?(&:empty?)
+        notice _("Nothing to synchronize")
+        redirect_to foreman_chef_environments_path
+      end
+    end
+
+    def synchronize
+      proxy = SmartProxy.authorized(:view_smart_proxies).find(params[:proxy])
+      if (errors = ChefServerImporter.new(:chef_proxy => proxy).obsolete_and_new(params[:changed])).empty?
+        notice _("Successfully updated environments")
+      else
+        error _("Failed to update environments: %s") % errors.to_sentence
+      end
+      redirect_to foreman_chef_environments_path
+    end
+
+    def index
+      @environments = resource_base.includes(:chef_proxy).search_for(params[:search], :order => params[:order]).paginate(:page => params[:page])
+    end
+
+    def new
+      @environment = ForemanChef::Environment.new
+    end
+
+    def create
+      @environment = ForemanChef::Environment.new(params[:foreman_chef_environment])
+      if @environment.save
+        process_success
+      else
+        process_error
+      end
+    end
+
+    def edit
+    end
+
+    def update
+      if @environment.update_attributes(params[:foreman_chef_environment])
+        process_success
+      else
+        process_error
+      end
+    end
+
+    def destroy
+      if @environment.destroy
+        process_success
+      else
+        process_error
+      end
+    end
+
+    def auto_complete_controller_name
+      'foreman_chef_environments'
+    end
+
+    def environments_for_chef_proxy
+      @chef_proxy = SmartProxy.authorized(:view_smart_proxies).with_features('Chef').find_by_id(params[:chef_proxy_id])
+      @environments = @chef_proxy.present? ? @chef_proxy.chef_environments : []
+      @type = params[:type]
+      render :layout => false
+    end
+
+    protected
+
+    def controller_permission
+      'chef_environments'
+    end
+
+    def action_permission
+      case params[:action]
+        when 'import', 'synchronize'
+          'import'
+        else
+          super
+      end
+    end
+  end
+end

data/app/helpers/foreman_chef/chef_proxy_form.rb

@@ -1,14 +1,28 @@
 module ForemanChef
   module ChefProxyForm
     def chef_proxy_form(f)
-    # Don't show this if we have no Chef proxies, otherwise always include blank
-    # so the user can choose not to use puppet on this host
-    proxies = SmartProxy.with_taxonomy_scope_override(@location,@organization).with_features('Chef')
-    return if proxies.count == 0
-    select_f f, :chef_proxy_id, proxies, :id, :name,
-             { :include_blank => blank_or_inherit_f(f, :chef_proxy) },
-             { :label       => _("Chef proxy"),
-               :help_inline => _("Use this foreman proxy as an entry point to your Chef, node will be managed via this proxy") }
+      # Don't show this if we have no Chef proxies, otherwise always include blank
+      # so the user can choose not to use puppet on this host
+      proxies = SmartProxy.with_taxonomy_scope_override(@location,@organization).with_features('Chef')
+      return if proxies.count == 0
+      javascript('chef_proxy_environment_refresh')
+
+      chef_proxy_form_chef_proxy_select(f, proxies) +
+        chef_proxy_form_chef_environment_select(f, f.object.available_chef_environments)
+    end
+
+    def chef_proxy_form_chef_environment_select(f, environments)
+      select_f(f, :chef_environment_id, environments, :id, :name,
+               {:include_blank => blank_or_inherit_f(f, :chef_environment_id)},
+               {:label => _("Chef environment")})
+    end
+
+    def chef_proxy_form_chef_proxy_select(f, proxies)
+      select_f(f, :chef_proxy_id, proxies, :id, :name,
+               { :include_blank => blank_or_inherit_f(f, :chef_proxy) },
+               { :label => _("Chef proxy"),
+                 :help_inline => _("Use this foreman proxy as an entry point to your Chef, node will be managed via this proxy"),
+                 :data => { :url => environments_for_chef_proxy_foreman_chef_environments_path } })
     end
   end
 end

data/app/lib/proxy_api/foreman_chef/chef_proxy.rb

@@ -17,6 +17,13 @@ module ProxyAPI
         end
       end
 
+      class Environment < ProxyAPI::Resource
+        def initialize(args)
+          @url = "#{args[:url]}/#{PREFIX}/environments"
+          super args
+        end
+      end
+
       def initialize(args)
         @args = args
       end
@@ -48,6 +55,12 @@ module ProxyAPI
       def delete_client(key)
         Client.new(@args).send(:delete, key)
       end
+
+      # List all Chef environments
+      # Returns : Hash representation of environments on chef server
+      def list_environments
+        Environment.new(@args).send(:get)
+      end
     end
   end
 end

data/app/models/foreman_chef/concerns/host_action_subject.rb

@@ -13,11 +13,10 @@ module ForemanChef
       def action_input_key
         "host"
       end
-
     end
   end
 end
 
 class ::Host::Managed::Jail < Safemode::Jail
-  allow :chef_proxy
+  allow :chef_proxy, :chef_environment
 end

data/app/models/foreman_chef/concerns/host_and_hostgroup_extensions.rb

@@ -0,0 +1,18 @@
+module ForemanChef
+  module Concerns
+    module HostAndHostgroupExtensions
+      extend ActiveSupport::Concern
+
+      included do
+        belongs_to :chef_proxy, :class_name => "SmartProxy"
+        belongs_to :chef_environment, :class_name => "ForemanChef::Environment"
+
+        attr_accessible :chef_proxy_id, :chef_environment_id
+      end
+
+      def available_chef_environments
+        self.chef_proxy.present? ? self.chef_proxy.chef_environments : []
+      end
+    end
+  end
+end

data/app/models/foreman_chef/concerns/host_extensions.rb

@@ -0,0 +1,17 @@
+module ForemanChef
+  module Concerns
+    module HostExtensions
+      extend ActiveSupport::Concern
+
+      included do
+        alias_method_chain :set_hostgroup_defaults, :chef_attributes
+      end
+
+      def set_hostgroup_defaults_with_chef_attributes
+        set_hostgroup_defaults_without_chef_attributes
+        return unless hostgroup
+        assign_hostgroup_attributes(['chef_proxy_id', 'chef_environment_id'])
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+module ForemanChef
+  module Concerns
+    module HostgroupExtensions
+      extend ActiveSupport::Concern
+
+      def inherited_chef_proxy_id
+        read_attribute(:chef_proxy_id) || nested(:chef_proxy_id)
+      end
+
+      def inherited_chef_environment_id
+        read_attribute(:chef_environment_id) || nested(:chef_environment_id)
+      end
+
+      def chef_proxy
+        if ancestry.present?
+          SmartProxy.with_features('Chef').find_by_id(inherited_chef_proxy_id)
+        else
+          super
+        end
+      end
+
+      def chef_environment
+        if ancestry.present?
+          ::ForemanChef::Environment.find_by_id(inherited_chef_environment_id)
+        else
+          super
+        end
+      end
+
+    end
+  end
+end

data/app/models/foreman_chef/concerns/smart_proxy_extensions.rb

@@ -0,0 +1,44 @@
+module ForemanChef
+  module Concerns
+    module SmartProxyExtensions
+      extend ActiveSupport::Concern
+
+      included do
+        has_many :chef_environments, :class_name => "::ForemanChef::Environment", :foreign_key => 'chef_proxy_id'
+      end
+
+      # create or overwrite instance methods...
+      def show_node(fqdn)
+        reply = ProxyAPI::ForemanChef::ChefProxy.new(:url => url).show_node(fqdn)
+        JSON.parse(reply)
+      rescue RestClient::ResourceNotFound
+        Foreman::Logging.logger('foreman_chef').debug "Node '#{fqdn}' not found"
+        return false
+      end
+
+      def delete_node(fqdn)
+        begin
+          reply = ProxyAPI::ForemanChef::ChefProxy.new(:url => url).delete_node(fqdn)
+          JSON.parse(reply)
+          #rescue RestClient::
+        end
+      end
+
+      def show_client(fqdn)
+        reply = ProxyAPI::ForemanChef::ChefProxy.new(:url => url).show_client(fqdn)
+        JSON.parse(reply)
+      rescue RestClient::ResourceNotFound
+        Foreman::Logging.logger('foreman_chef').debug "Client '#{fqdn}' not found"
+        return false
+      end
+
+      def delete_client(fqdn)
+        begin
+          reply = ProxyAPI::ForemanChef::ChefProxy.new(:url => url).delete_client(fqdn)
+          JSON.parse(reply)
+          #rescue RestClient::
+        end
+      end
+    end
+  end
+end

data/app/models/foreman_chef/environment.rb

@@ -0,0 +1,33 @@
+module ForemanChef
+  class Environment < ActiveRecord::Base
+    include Authorizable
+    extend FriendlyId
+    friendly_id :name
+    include Parameterizable::ByName
+
+    has_many :hosts, :class_name => '::Host::Managed'
+    has_many :hostgroups, :class_name => '::Hostgroup'
+    belongs_to :chef_proxy, :class_name => '::SmartProxy'
+
+    attr_accessible :name, :description, :chef_proxy_id
+
+    validates :name, :uniqueness => true, :presence => true, :format => { :with => /\A[\w\d\.]+\z/, :message => N_('is alphanumeric and cannot contain spaces') }
+
+    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
+    scoped_search :in => :chef_proxy, :on => :name, :complete_value => true, :rename => 'chef_proxy.name'
+
+    class Jail < Safemode::Jail
+      allow :name
+    end
+
+    def self.humanize_class_name(_name = nil)
+      _('Chef environment')
+    end
+
+    def self.permission_name(action)
+      "#{action}_chef_environments"
+    end
+  end
+end

data/app/models/foreman_chef/fact_importer.rb

@@ -75,7 +75,7 @@ module ForemanChef
     end
 
     def fact_names
-      @fact_names ||= fact_name_class.maximum(:id, :group => 'name')
+      @fact_names ||= fact_name_class.group(:name).maximum(:id)
     end
 
     # if the host does not exists yet, we don't have an host_id to use the fact_values table.

data/app/models/foreman_chef/fact_name.rb

@@ -1,4 +1,5 @@
 module ForemanChef
   class FactName < ::FactName
+    attr_accessible :compose
   end
 end

data/app/overrides/add_chef_proxy.rb

@@ -14,3 +14,4 @@ Deface::Override.new(:virtual_path => "hostgroups/_form",
 # detected within the full override template string above
 N_('Chef proxy')
 N_('Use this foreman proxy as an entry point to your Chef, node will be managed via this proxy')
+N_('Chef environment')

data/app/services/foreman_chef/chef_server_importer.rb

@@ -0,0 +1,100 @@
+module ForemanChef
+  class ChefServerImporter
+    def initialize(args = {})
+      @chef_proxy = args[:chef_proxy]
+      @environment = args[:env]
+      @proxy = args[:proxy]
+      @url_arg = args[:url]
+    end
+
+    def proxy
+      if @proxy
+        @proxy
+      elsif @url_arg
+        @proxy = ProxyAPI::ForemanChef::ChefProxy.new(:url => @url_arg)
+      else
+        url = SmartProxy.with_features('Chef').first.try(:url)
+        raise "Can't find a valid Proxy with a Chef feature" if url.blank?
+        @proxy = ProxyAPI::ForemanChef::ChefProxy.new(:url => url)
+      end
+    end
+    attr_writer :proxy
+
+    # return changes hash, currently exists to keep compatibility with importer html
+    def changes
+      changes = {'new' => {}, 'obsolete' => {}, 'updated' => {}}
+
+      if @environment.nil?
+        new_environments.each do |env|
+          changes['new'][env] = {}
+        end
+
+        old_environments.each do |env|
+          changes['obsolete'][env] = {}
+        end
+      else
+        env = @environment
+        changes['new'][env] = {} if new_environments.include?(@environment)
+        changes['obsolete'][env] = {} if old_environments.include?(@environment)
+      end
+      changes
+    end
+
+    # Update the environments based upon the user's selection
+    # +changes+ : Hash with two keys: :new and :obsolete.
+    #               changed[:/new|obsolete/] is and Array of Strings
+    # Returns   : Array of Strings containing all record errors
+    def obsolete_and_new(changes = { })
+      return if changes.empty?
+      if changes['new'].present?
+        changes['new'].each { |name, _| ForemanChef::Environment.create(:name => name, :chef_proxy_id => @chef_proxy.id) }
+      end
+      if changes['obsolete'].present?
+        changes['obsolete'].each { |name, _| ForemanChef::Environment.where(:chef_proxy_id => @chef_proxy.id).find_by_name(name).destroy }
+      end
+      []
+    end
+
+    def db_environments
+      @db_environments ||= (ForemanChef::Environment.where(:chef_proxy_id => @chef_proxy.id).pluck('name') - ignored_environments)
+    end
+
+    def actual_environments
+      @actual_environments ||= (fetch_environments_from_proxy.map { |e| e['name'] } - ignored_environments)
+    end
+
+    def new_environments
+      actual_environments - db_environments
+    end
+
+    def old_environments
+      db_environments - actual_environments
+    end
+
+    private
+
+    def fetch_environments_from_proxy
+      JSON.parse(proxy.list_environments)
+    rescue => e
+      Foreman::Logging.exception 'Failed to get environments from proxy', e
+      return []
+    end
+
+    def ignored_environments
+      ignored_file[:ignored] || []
+    end
+
+    def ignored_file
+      return @ignored_file if @ignored_file
+      file = File.join(Rails.root.to_s, "config", "ignored_environments.yml")
+      @ignored_file = File.exist?(file) ? YAML.load_file(file) : {}
+    rescue => e
+      logger.warn "Failed to parse environment ignore file: #{e}"
+      @ignored_file = {}
+    end
+
+    def logger
+      @logger ||= Foreman::Logging.logger('foreman_chef')
+    end
+  end
+end

data/app/views/foreman/unattended/snippets/_chef_client_bootstrap.erb

@@ -43,7 +43,8 @@ EOF
 
 #first run of chef-client
 echo "First run of chef-client"
-/usr/local/bin/chef-client -j /tmp/base.json || /usr/bin/chef-client -j /tmp/base.json
+<% chef_args = "-j /tmp/base.json -E #{@host.chef_environment.nil? ? '_default' : @host.chef_environment.name }" -%>
+/usr/local/bin/chef-client <%= chef_args %> || /usr/bin/chef-client <%= chef_args %>
 
 echo "Finished, cleaning"
 rm -f /tmp/base.json

data/app/views/foreman_chef/environments/_form.html.erb

@@ -0,0 +1,11 @@
+<%= form_for @environment, :url => (@environment.new_record? ? foreman_chef_environments_path : foreman_chef_environment_path(:id => @environment)) do |f| %>
+  <%= base_errors_for @environment %>
+
+  <%= text_f f, :name %>
+  <%= select_f f, :chef_proxy_id, SmartProxy.with_features('Chef'), :id, :name,
+               {},
+               { :label => _('Chef proxy'), :help_inline => popover('Chef proxy association', _('When you select this proxy in host or host group form,<br>all associated environments will be loaded into environment select box')) } %>
+  <%= textarea_f f, :description, :rows => 3 %>
+
+  <%= submit_or_cancel f, false, :cancel_path => foreman_chef_environments_path %>
+<% end %>

data/app/views/foreman_chef/environments/edit.html.erb

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

data/app/views/foreman_chef/environments/environments_for_chef_proxy.html.erb

@@ -0,0 +1,3 @@
+<%= fields_for @type do |f| %>
+  <%= chef_proxy_form_chef_environment_select f, @environments %>
+<% end %>

data/app/views/foreman_chef/environments/import.html.erb

@@ -0,0 +1,58 @@
+<% title _("Changed environments") %>
+<%= form_tag synchronize_foreman_chef_environments_path do %>
+  <%= hidden_field_tag :proxy, params[:proxy] %>
+  <h4><%= _("Select the changes you want to realize in Foreman") %></h4>
+  <h6>
+    <%= _("Toggle") %>:
+    <%= link_to_function(icon_text("check", _("New")),
+                         "toggleCheckboxesBySelector('.env_select_boxes_new')",
+                         :title => _("Check/Uncheck new")) %> |
+    <%= link_to_function(icon_text("check", _("Updated")),
+                         "toggleCheckboxesBySelector('.env_select_boxes_updated')",
+                         :title => _("Check/Uncheck updated")) %> |
+    <%= link_to_function(icon_text("check", _("Obsolete")),
+                         "toggleCheckboxesBySelector('.env_select_boxes_obsolete')",
+                         :title => _("Check/Uncheck obsolete")) %>
+  </h6>
+  <table class="table table-striped table-bordered">
+    <thead>
+    <tr>
+      <th class="ca">
+        <%= link_to_function(icon_text("check"),
+                             "toggleCheckboxesBySelector('.env_select_boxes')",
+                             :title => _("Check/Uncheck all")) %>
+      </th>
+      <th><%= _("Environment") %></th>
+      <th><%= _("Operation") %></th>
+      <th><%= _("Additional data") %></th>
+    </tr>
+    </thead>
+    <tbody>
+    <% for kind in ["new", "obsolete", "updated"] %>
+      <% unless (envs = @changed[kind]).empty? %>
+        <% for env in envs.keys.sort %>
+          <tr>
+            <td>
+              <%= check_box_tag "changed[#{kind}][#{env}]", @changed[kind][env].to_json, false, :class => "env_select_boxes env_select_boxes_#{kind} env_select_boxes_env_#{env}" %>
+            </td>
+            <td>
+              <%= link_to_function("#{env}", "toggleCheckboxesBySelector('.env_select_boxes_env_#{env}')", :title => _("Check/Uncheck all %s changes") % env) %>
+            </td>
+            <td>
+              <%= {"new" => _("Add:"), "obsolete" => _("Remove:"), "updated" => _("Update:")}[kind] %>
+            </td>
+            <td>
+              <% pcs = @changed[kind][env] %>
+              <%= class_update_text pcs, env %>
+            </td>
+          </tr>
+        <% end %>
+      <% end %>
+    <% end %>
+    </tbody>
+  </table>
+  <div>
+    <%= link_to _("Cancel"), send("foreman_chef_environments_path"), :class => "btn btn-default" %>
+    <%= submit_tag _("Update"), :class => "btn btn-primary" %>
+  </div>
+<% end %>

data/app/views/foreman_chef/environments/index.html.erb

@@ -0,0 +1,35 @@
+<% title _('Chef Environments') %>
+
+<% title_actions(
+           select_action_button(_('Import'), {}, SmartProxy.with_features('Chef').map do |proxy|
+                                             display_link_if_authorized(_("Import from %s chef server") % proxy.name,
+                                                                        hash_for_import_foreman_chef_environments_path(:proxy => proxy),
+                                                                        {:class => 'btn btn-default', :"data-no-turbolink" => true})
+                                           end.flatten)
+   ) %>
+<% title_actions button_group(display_link_if_authorized(_('New Chef Environment'), hash_for_new_foreman_chef_environment_path)) %>
+
+<table class="table table-bordered table-striped">
+  <tr>
+    <th><%= sort :name, :as => s_('Environment|Name') %></th>
+    <th><%= sort :host, :as => _('Hosts'), :default => 'DESC'  %></th>
+    <th><%= sort :hostgroup, :as => _('Host groups'), :default => 'DESC' %></th>
+    <th><%= sort 'chef_proxy.name', :as => _('Chef proxy'), :default => 'DESC' %></th>
+    <th></th>
+  </tr>
+  <% for chef_environment in @environments %>
+    <tr>
+      <td><%= link_to_if_authorized h(chef_environment.name), hash_for_edit_foreman_chef_environment_path(:id => chef_environment).merge(:auth_object => chef_environment, :authorizer => authorizer) %></td>
+      <td><%= link_to_if_authorized(chef_environment.hosts.count, hash_for_hosts_path(:search => "chef_environment = #{chef_environment}")) %></td>
+      <td><%= link_to_if_authorized(chef_environment.hostgroups.count, hash_for_hostgroups_path(:search => "chef_environment = #{chef_environment}")) %></td>
+      <td><%= link_to_if_authorized(chef_environment.chef_proxy.name, hash_for_smart_proxy_path(chef_environment.chef_proxy)) %></td>
+      <td>
+        <%= action_buttons(display_delete_if_authorized(hash_for_foreman_chef_environment_path(:id => chef_environment).merge(:auth_object => chef_environment, :authorizer => authorizer),
+                                                       :confirm => _('Delete %s?') % chef_environment.name)) %>
+      </td>
+    </tr>
+  <% end %>
+</table>
+
+<%= page_entries_info @environments %>
+<%= will_paginate @environments %>

data/app/views/foreman_chef/environments/new.html.erb

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

data/config/routes.rb

@@ -0,0 +1,14 @@
+Rails.application.routes.draw do
+
+  namespace :foreman_chef do
+    resources :environments do
+      collection do
+        get :auto_complete_search
+        get :import
+        post :synchronize
+        get :environments_for_chef_proxy
+      end
+    end
+  end
+
+end

data/db/migrate/20150916141657_create_chef_environment.rb

@@ -0,0 +1,20 @@
+class CreateChefEnvironment < ActiveRecord::Migration
+  def up
+    create_table :foreman_chef_environments do |t|
+      t.string :name, :default => '', :null => false
+      t.text :description, :default => ''
+      t.integer :chef_proxy_id, :null => false
+      t.timestamps
+    end
+
+    add_column :hosts, :chef_environment_id, :integer
+    add_column :hostgroups, :chef_environment_id, :integer
+  end
+
+  def down
+    remove_column :hostgroups, :chef_environment_id
+    remove_column :hosts, :chef_environment_id
+
+    drop_table :foreman_chef_environments
+  end
+end

data/lib/foreman_chef/engine.rb

@@ -12,6 +12,24 @@ module ForemanChef
       end
     end
 
+    config.autoload_paths += Dir["#{config.root}/app/helpers/concerns"]
+
+    # Precompile any JS or CSS files under app/assets/
+    # If requiring files from each other, list them explicitly here to avoid precompiling the same
+    # content twice.
+    assets_to_precompile =
+      Dir.chdir(root) do
+        Dir['app/assets/javascripts/**/*', 'app/assets/stylesheets/**/*'].map do |f|
+          f.split(File::SEPARATOR, 4).last.gsub(/\.scss\Z/, '')
+        end
+      end
+    initializer 'foreman_chef.assets.precompile' do |app|
+      app.config.assets.precompile += assets_to_precompile
+    end
+    initializer 'foreman_chef.configure_assets', group: :assets do
+      SETTINGS[:foreman_chef] = { assets: { precompile: assets_to_precompile } }
+    end
+
     initializer 'foreman_chef.load_default_settings', :before => :load_config_initializers do
       require_dependency File.expand_path('../../../app/models/setting/foreman_chef.rb', __FILE__) if (Setting.table_exists? rescue(false))
     end
@@ -28,8 +46,20 @@ module ForemanChef
 
     initializer 'foreman_chef.register_plugin', :after => :finisher_hook do |app|
       Foreman::Plugin.register :foreman_chef do
-        requires_foreman '>= 1.9'
+        requires_foreman '>= 1.11'
         allowed_template_helpers :chef_bootstrap
+
+        permission :import_chef_environments, { :environments => [:import, :synchronize] }, :resource_type => 'ForemanChef::Environment'
+        permission :view_chef_environments, { :environments => [:index, :environments_for_chef_proxy] }, :resource_type => 'ForemanChef::Environment'
+        permission :edit_chef_environments, { :environments => [:edit, :update] }, :resource_type => 'ForemanChef::Environment'
+        permission :destroy_chef_environments, { :environments => [:destroy] }, :resource_type => 'ForemanChef::Environment'
+
+        divider :top_menu, :caption => N_('Chef'), :last => true, :parent => :configure_menu
+        menu :top_menu, :chef_environments,
+             url_hash: { controller: 'foreman_chef/environments', action: :index },
+             caption: N_('Environments'),
+             parent: :configure_menu,
+             last: true
       end
     end
 
@@ -44,13 +74,15 @@ module ForemanChef
 
     #Include extensions to models in this config.to_prepare block
     config.to_prepare do
-      ::Host::Managed.send :include, ForemanChef::HostExtensions
-      ::Hostgroup.send :include, ForemanChef::HostgroupExtensions
-      ::Host::Managed.send :include, ChefProxyAssociation
-      ::Hostgroup.send :include, ChefProxyAssociation
-      ::SmartProxy.send :include, SmartProxyExtensions
       ::FactImporter.register_fact_importer(:foreman_chef, ForemanChef::FactImporter)
       ::FactParser.register_fact_parser(:foreman_chef, ForemanChef::FactParser)
+      ::ConfigReportImporter.register_smart_proxy_feature('Chef')
+
+      ::Host::Managed.send :include, ForemanChef::Concerns::HostAndHostgroupExtensions
+      ::Hostgroup.send :include, ForemanChef::Concerns::HostAndHostgroupExtensions
+      ::Host::Managed.send :include, ForemanChef::Concerns::HostExtensions
+      ::Hostgroup.send :include, ForemanChef::Concerns::HostgroupExtensions
+      ::SmartProxy.send :include, ForemanChef::Concerns::SmartProxyExtensions
       ::Host::Base.send :include, ForemanChef::Concerns::HostActionSubject
       ::HostsController.send :include, ForemanChef::Concerns::HostsControllerRescuer
       # Renderer Concern needs to be injected to controllers, ForemanRenderer was already included
@@ -63,4 +95,12 @@ module ForemanChef
       ::Foreman::Renderer.send :include, ForemanChef::Concerns::Renderer
     end
   end
+
+  def self.table_name_prefix
+    "foreman_chef_"
+  end
+
+  def use_relative_model_naming
+    true
+  end
 end

data/lib/foreman_chef/version.rb

@@ -1,3 +1,3 @@
 module ForemanChef
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_chef
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Marek Hulan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-24 00:00:00.000000000 Z
+date: 2016-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -68,28 +68,41 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/assets/javascripts/chef_proxy_environment_refresh.js
+- app/controllers/foreman_chef/application_controller.rb
 - app/controllers/foreman_chef/concerns/hosts_controller_rescuer.rb
+- app/controllers/foreman_chef/environments_controller.rb
 - app/helpers/foreman_chef/chef_proxy_form.rb
 - app/lib/actions/foreman_chef/client/destroy.rb
 - app/lib/actions/foreman_chef/host/destroy.rb
 - app/lib/proxy_api/foreman_chef/chef_proxy.rb
-- app/models/foreman_chef/chef_proxy_association.rb
 - app/models/foreman_chef/concerns/host_action_subject.rb
+- app/models/foreman_chef/concerns/host_and_hostgroup_extensions.rb
+- app/models/foreman_chef/concerns/host_extensions.rb
+- app/models/foreman_chef/concerns/hostgroup_extensions.rb
 - app/models/foreman_chef/concerns/renderer.rb
+- app/models/foreman_chef/concerns/smart_proxy_extensions.rb
+- app/models/foreman_chef/environment.rb
 - app/models/foreman_chef/fact_importer.rb
 - app/models/foreman_chef/fact_name.rb
 - app/models/foreman_chef/fact_parser.rb
-- app/models/foreman_chef/host_extensions.rb
-- app/models/foreman_chef/hostgroup_extensions.rb
-- app/models/foreman_chef/smart_proxy_extensions.rb
 - app/models/setting/foreman_chef.rb
 - app/overrides/add_chef_proxy.rb
+- app/services/foreman_chef/chef_server_importer.rb
 - app/services/foreman_chef/proxy_exception.rb
 - app/views/foreman/unattended/snippets/_chef_client_bootstrap.erb
 - app/views/foreman/unattended/snippets/_chef_client_gem_bootstrap.erb
 - app/views/foreman/unattended/snippets/_chef_client_omnibus_bootstrap.erb
+- app/views/foreman_chef/environments/_form.html.erb
+- app/views/foreman_chef/environments/edit.html.erb
+- app/views/foreman_chef/environments/environments_for_chef_proxy.html.erb
+- app/views/foreman_chef/environments/import.html.erb
+- app/views/foreman_chef/environments/index.html.erb
+- app/views/foreman_chef/environments/new.html.erb
+- config/routes.rb
 - db/migrate/20140220145827_add_chef_proxy_id_to_host.rb
 - db/migrate/20140513144804_add_chef_proxy_id_to_hostgroup.rb
+- db/migrate/20150916141657_create_chef_environment.rb
 - db/seeds.rb
 - lib/foreman_chef.rb
 - lib/foreman_chef/engine.rb

data/app/models/foreman_chef/chef_proxy_association.rb

@@ -1,10 +0,0 @@
-module ForemanChef
-  module ChefProxyAssociation
-    extend ActiveSupport::Concern
-
-    included do
-      belongs_to :chef_proxy, :class_name => "SmartProxy"
-    end
-
-  end
-end

data/app/models/foreman_chef/host_extensions.rb

@@ -1,16 +0,0 @@
-module ForemanChef
-  module HostExtensions
-    extend ActiveSupport::Concern
-
-    included do
-      alias_method_chain :set_hostgroup_defaults, :chef_proxy
-    end
-
-    def set_hostgroup_defaults_with_chef_proxy
-      set_hostgroup_defaults_without_chef_proxy
-      return unless hostgroup
-      assign_hostgroup_attributes(['chef_proxy_id'])
-    end
-
-  end
-end

data/app/models/foreman_chef/hostgroup_extensions.rb

@@ -1,18 +0,0 @@
-module ForemanChef
-  module HostgroupExtensions
-    extend ActiveSupport::Concern
-
-    def inherited_chef_proxy_id
-      read_attribute(:chef_proxy_id) || nested(:chef_proxy_id)
-    end
-
-    def chef_proxy
-      if ancestry.present?
-        SmartProxy.with_features('Chef').find_by_id(inherited_chef_proxy_id)
-      else
-        super
-      end
-    end
-
-  end
-end

data/app/models/foreman_chef/smart_proxy_extensions.rb

@@ -1,38 +0,0 @@
-module ForemanChef
-  module SmartProxyExtensions
-    extend ActiveSupport::Concern
-
-    # create or overwrite instance methods...
-    def show_node(fqdn)
-      reply = ProxyAPI::ForemanChef::ChefProxy.new(:url => url).show_node(fqdn)
-      JSON.parse(reply)
-    rescue RestClient::ResourceNotFound
-      Foreman::Logging.logger('foreman_chef').debug "Node '#{fqdn}' not found"
-      return false
-    end
-
-    def delete_node(fqdn)
-      begin
-        reply = ProxyAPI::ForemanChef::ChefProxy.new(:url => url).delete_node(fqdn)
-        JSON.parse(reply)
-      #rescue RestClient::
-      end
-    end
-
-    def show_client(fqdn)
-      reply = ProxyAPI::ForemanChef::ChefProxy.new(:url => url).show_client(fqdn)
-      JSON.parse(reply)
-    rescue RestClient::ResourceNotFound
-      Foreman::Logging.logger('foreman_chef').debug "Client '#{fqdn}' not found"
-      return false
-    end
-
-    def delete_client(fqdn)
-      begin
-        reply = ProxyAPI::ForemanChef::ChefProxy.new(:url => url).delete_client(fqdn)
-        JSON.parse(reply)
-        #rescue RestClient::
-      end
-    end
-  end
-end