foreman_salt 1.1.1 → 2.0.0

data/app/helpers/foreman_salt/salt_keys_helper.rb

@@ -1,9 +1,8 @@
 module ForemanSalt
   module SaltKeysHelper
     def salt_keys_state_filter
-      select_tag 'Filter', options_for_select(['', _('Accepted'),_('Rejected'), _('Unaccepted')], params[:state]),
-        :onchange => "window.location.href = location.protocol + '//' + location.host + location.pathname + (this.value == '' ? '' : ('?state=' + this.value))"
+      select_tag 'Filter', options_for_select(['', _('Accepted'), _('Rejected'), _('Unaccepted')], params[:state]),
+                 :onchange => "window.location.href = location.protocol + '//' + location.host + location.pathname + (this.value == '' ? '' : ('?state=' + this.value))"
     end
   end
 end
-

data/app/lib/actions/foreman_salt/report_import.rb

@@ -2,7 +2,6 @@ module Actions
   module ForemanSalt
     if defined? ForemanTasks
       class ReportImport < Actions::EntryAction
-
         def resource_locks
           :report_import
         end
@@ -15,7 +14,7 @@ module Actions
           ::User.as_anonymous_admin do
             reports = ::ForemanSalt::ReportImporter.import(input[:report], input[:proxy_id])
 
-            output[:state] = {:message => "Imported #{reports.count} new reports"}
+            output[:state] = { :message => "Imported #{reports.count} new reports" }
             output[:hosts] = reports.map { |report| report.host.name }
           end
         end

data/app/lib/proxy_api/salt.rb

@@ -32,7 +32,7 @@ module ::ProxyAPI
     end
 
     def key_accept(name)
-      parse(post('',"key/#{name}"))
+      parse(post('', "key/#{name}"))
     rescue => e
       raise ProxyException.new(url, e, N_('Unable to accept Salt key for %s'), name)
     end

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

@@ -43,16 +43,16 @@ module ForemanSalt
           logger.warn 'Unable to execute salt run, no salt proxies defined'
           return false
         end
-        ProxyAPI::Salt.new({:url => salt_proxy.url}).highstate name
+        ProxyAPI::Salt.new(:url => salt_proxy.url).highstate name
       rescue => e
         errors.add(:base, _('Failed to execute state.highstate: %s') % e)
         false
       end
 
       def set_hostgroup_defaults_with_salt_proxy
-         return unless hostgroup
-         assign_hostgroup_attributes(%w{salt_proxy_id salt_environment_id})
-         set_hostgroup_defaults_without_salt_proxy
+        return unless hostgroup
+        assign_hostgroup_attributes(%w(salt_proxy_id salt_environment_id))
+        set_hostgroup_defaults_without_salt_proxy
       end
 
       def smart_proxy_ids_with_salt_proxy

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

@@ -40,7 +40,7 @@ module ForemanSalt
         if ancestry.present?
           read_attribute(:salt_proxy_id) || self.class.sort_by_ancestry(ancestors.where('salt_proxy_id is not NULL')).last.try(:salt_proxy_id)
         else
-          self.salt_proxy_id
+          salt_proxy_id
         end
       end
 
@@ -53,7 +53,7 @@ module ForemanSalt
         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
+          salt_environment_id
         end
       end
 

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

@@ -7,7 +7,7 @@ module ForemanSalt
 
         included do
           after_validation :queue_salt_autosign
-          before_destroy   :queue_salt_destroy
+          before_destroy :queue_salt_destroy
         end
 
         def salt?

data/app/models/foreman_salt/fact_name.rb

@@ -1,4 +1,3 @@
 module ForemanSalt
   class FactName < ::FactName; end
 end
-

data/app/models/foreman_salt/salt_environment.rb

@@ -2,6 +2,8 @@ module ForemanSalt
   class SaltEnvironment < ActiveRecord::Base
     include Taxonomix
     include Authorizable
+    extend FriendlyId
+    friendly_id :name
 
     before_destroy EnsureNotUsedBy.new(:hosts, :hostgroups)
 

data/app/models/foreman_salt/salt_module.rb

@@ -2,10 +2,12 @@ module ForemanSalt
   class SaltModule < ActiveRecord::Base
     include Taxonomix
     include Authorizable
+    extend FriendlyId
+    friendly_id :name
 
     before_destroy EnsureNotUsedBy.new(:hosts, :hostgroups)
     has_and_belongs_to_many :hosts, :class_name => '::Host::Managed', :join_table => 'hosts_salt_modules',
-                            :association_foreign_key => 'host_id'
+                                    :association_foreign_key => 'host_id'
 
     has_and_belongs_to_many :hostgroups, :class_name => '::Hostgroup', :join_table => 'hostgroups_salt_modules'
 

data/app/models/setting/salt.rb

@@ -0,0 +1,12 @@
+class Setting::Salt < Setting
+  def self.load_defaults
+    return unless super
+
+    transaction do
+      [
+        set('salt_namespace_pillars', N_("Namespace Foreman pillars under 'foreman' key"), false)
+      ].each { |s| self.create! s.update(:category => 'Setting::Salt') }
+    end
+    true
+  end
+end

data/app/overrides/salt_modules_selector.rb

@@ -1,19 +1,19 @@
 Deface::Override.new(:virtual_path => 'hosts/_form',
-  :name => 'add_salt_modules_tab_to_host',
-  :insert_after => 'li.active',
-  :partial => '../overrides/foreman/salt_modules/host_tab')
+                     :name => 'add_salt_modules_tab_to_host',
+                     :insert_after => 'li.active',
+                     :partial => '../overrides/foreman/salt_modules/host_tab')
 
 Deface::Override.new(:virtual_path => 'hosts/_form',
-  :name => 'add_salt_modules_tab_pane_to_host',
-  :insert_before => 'div#puppet_klasses',
-  :partial => '../overrides/foreman/salt_modules/host_tab_pane')
+                     :name => 'add_salt_modules_tab_pane_to_host',
+                     :insert_before => 'div#puppet_klasses',
+                     :partial => '../overrides/foreman/salt_modules/host_tab_pane')
 
 Deface::Override.new(:virtual_path => 'hostgroups/_form',
-  :name => 'add_salt_modules_tab_to_hg',
-  :insert_after => 'li.active',
-  :partial => '../overrides/foreman/salt_modules/host_tab')
+                     :name => 'add_salt_modules_tab_to_hg',
+                     :insert_after => 'li.active',
+                     :partial => '../overrides/foreman/salt_modules/host_tab')
 
 Deface::Override.new(:virtual_path => 'hostgroups/_form',
-  :name => 'add_salt_modules_tab_pane_to_hg',
-  :insert_before => 'div#puppet_klasses',
-  :partial => '../overrides/foreman/salt_modules/host_tab_pane')
+                     :name => 'add_salt_modules_tab_pane_to_hg',
+                     :insert_before => 'div#puppet_klasses',
+                     :partial => '../overrides/foreman/salt_modules/host_tab_pane')

data/app/services/foreman_salt/fact_importer.rb

@@ -8,6 +8,10 @@ module ForemanSalt
       true
     end
 
+    def self.authorized_smart_proxy_features
+      'Salt'
+    end
+
     private
 
     attr_accessor :original_facts
@@ -82,27 +86,26 @@ module ForemanSalt
     end
 
     def sort_by_key(hash)
-      hash.sort_by { |k, v| k.to_s }
+      hash.sort_by { |k, _v| k.to_s }
     end
 
     def sparse(hash, options = {})
       hash.map do |k, v|
-        prefix = (options.fetch(:prefix, [])+[k])
-        next Sparsify::sparse(v, options.merge(:prefix => prefix)) if v.is_a? Hash
+        prefix = (options.fetch(:prefix, []) + [k])
+        next Sparsify.sparse(v, options.merge(:prefix => prefix)) if v.is_a? Hash
         { prefix.join(options.fetch(:separator, FactName::SEPARATOR)) => v }
-      end.reduce(:merge) || Hash.new
+      end.reduce(:merge) || {}
     end
 
     def unsparse(hash, options = {})
-      ret = Hash.new
+      ret = {}
       sparse(hash).each do |k, v|
         current            = ret
         key                = k.to_s.split(options.fetch(:separator, FactName::SEPARATOR))
-        current            = (current[key.shift] ||= Hash.new) until (key.size<=1)
+        current            = (current[key.shift] ||= Hash.new) until (key.size <= 1)
         current[key.first] = v
       end
       ret
     end
   end
 end
-

data/app/services/foreman_salt/fact_parser.rb

@@ -0,0 +1,100 @@
+module ForemanSalt
+  class FactParser < ::FactParser
+    attr_reader :facts
+
+    def operatingsystem
+      os = Operatingsystem.where(os_hash).first_or_initialize
+      if os.new_record?
+        os.deduce_family
+        os.release_name = facts[:lsb_distrib_codename]
+        os.save
+      end
+      os if os.persisted?
+    end
+
+    def architecture
+      name = facts[:osarch]
+      name = 'x86_64' if name == 'amd64'
+      Architecture.find_or_create_by_name name unless name.blank?
+    end
+
+    def environment
+      # Don't touch the Puppet environment field
+    end
+
+    def model
+      name = facts[:productname]
+      Model.find_or_create_by_name(name.strip) unless name.blank?
+    end
+
+    def domain
+      name = facts[:domain]
+      Domain.find_or_create_by_name name unless name.blank?
+    end
+
+    def ip
+      ip = facts.find { |fact, value| fact =~ /^fqdn_ip4/ && value && value != '127.0.0.1' }
+      ip[1] if ip
+    end
+
+    def primary_interface
+      interface = interfaces.find { |_, value| value[:ipaddress] == ip }
+      interface[0] if interface
+    end
+
+    def mac
+      interface = interfaces.find { |_, value| value[:ipaddress] == ip }
+      interface[1][:macaddress] if interface
+    end
+
+    def ipmi_interface
+      nil
+    end
+
+    def interfaces
+      interfaces = {}
+
+      facts.each do |fact, value|
+        next unless value && fact.to_s =~ /^ip_interfaces/
+        (_, interface, number) = fact.split(FactName::SEPARATOR)
+
+        interface_name = if number == '0' || number.nil?
+                           interface
+                         else
+                           "#{interface}.#{number}"
+                         end
+
+        if !interface.blank? && interface != 'lo'
+          interfaces[interface_name] = {} if interfaces[interface_name].blank?
+          interfaces[interface_name].merge!(:ipaddress => value, :macaddress => macs[interface])
+        end
+      end
+
+      interfaces
+    end
+
+    def support_interfaces_parsing?
+      true
+    end
+
+    private
+
+    def os_hash
+      (_, major, minor) = /(\d+)\.?(\d+)?\.?(\d+)?/.match(facts[:osrelease]).to_a
+      { :name => facts[:os], :major => major, :minor => minor }
+    end
+
+    def macs
+      unless @macs
+        @macs = {}
+        facts.each do |fact, value|
+          next unless value && fact.to_s =~ /^hwaddr_interfaces/
+          data = fact.split(FactName::SEPARATOR)
+          interface = data[1]
+          macs[interface] = value
+        end
+      end
+      @macs
+    end
+  end
+end

data/app/services/foreman_salt/report_importer.rb

@@ -106,34 +106,37 @@ module ForemanSalt
           end
         end
 
-        time[resource] = result['duration'] if result['duration']
+        time[resource] = if result['duration'].is_a? String
+                           Float(result['duration'].delete(' ms')) rescue nil
+                         else
+                           result['duration']
+                         end
       end
 
       time[:total] = time.values.inject(&:+)
-      events = {:total => changed + failed + restarted + restarted_failed, :success => success + restarted, :failure => failed + restarted_failed}
+      events = { :total => changed + failed + restarted + restarted_failed, :success => success + restarted, :failure => failed + restarted_failed }
 
-      changes = {:total => changed + restarted}
+      changes = { :total => changed + restarted }
 
-      resources = {'total' => @raw.size, 'applied' => changed, 'restarted' => restarted, 'failed' => failed,
-        'failed_restarts' => restarted_failed, 'skipped' => 0, 'scheduled' => 0}
+      resources = { 'total' => @raw.size, 'applied' => changed, 'restarted' => restarted, 'failed' => failed,
+                    'failed_restarts' => restarted_failed, 'skipped' => 0, 'scheduled' => 0 }
 
-      {:events => events, :resources => resources, :changes => changes, :time => time}
+      { :events => events, :resources => resources, :changes => changes, :time => time }
     end
 
     def process_normal
-        metrics = calculate_metrics
-        status = ReportStatusCalculator.new(:counters => metrics[:resources].slice(*::Report::METRIC)).calculate
+      metrics = calculate_metrics
+      status = ReportStatusCalculator.new(:counters => metrics[:resources].slice(*::Report::METRIC)).calculate
 
-        @host.puppet_status = status
+      @host.puppet_status = status
 
-        @report = Report.new(:host => @host, :reported_at => start_time, :status => status, :metrics => metrics)
-        return @report unless @report.save
-        import_log_messages
+      @report = Report.new(:host => @host, :reported_at => start_time, :status => status, :metrics => metrics)
+      return @report unless @report.save
+      import_log_messages
     end
 
-
     def process_failures
-      status = ReportStatusCalculator.new({:counters => {'failed' => @raw.size}}).calculate
+      status = ReportStatusCalculator.new(:counters => { 'failed' => @raw.size }).calculate
       @report = Report.create(:host => @host, :reported_at => Time.now, :status => status, :metrics => {})
 
       @host.puppet_status = status

data/app/services/foreman_salt/smart_proxies/salt_keys.rb

@@ -1,56 +1,53 @@
 module ForemanSalt
   class SmartProxies::SaltKeys
-
     attr_reader :name, :state, :fingerprint, :smart_proxy_id
 
-     def initialize(opts)
-       @name, @state, @fingerprint, @smart_proxy_id = opts.flatten
-     end
-
-       class << self
+    def initialize(opts)
+      @name, @state, @fingerprint, @smart_proxy_id = opts.flatten
+    end
 
-         def all(proxy)
-           raise ::Foreman::Exception.new(N_('Must specify a Smart Proxy to use')) if proxy.nil?
+    class << self
+      def all(proxy)
+        raise ::Foreman::Exception.new(N_('Must specify a Smart Proxy to use')) if proxy.nil?
 
-           unless (keys = Rails.cache.read("saltkeys_#{proxy.id}"))
-             api = ProxyAPI::Salt.new({:url => proxy.url})
-             keys = api.key_list.map do |name, properties|
-               new([name.strip, properties['state'], properties['fingerprint'], proxy.id])
-             end.compact
+        unless (keys = Rails.cache.read("saltkeys_#{proxy.id}"))
+          api = ProxyAPI::Salt.new(:url => proxy.url)
+          keys = api.key_list.map do |name, properties|
+            new([name.strip, properties['state'], properties['fingerprint'], proxy.id])
+          end.compact
 
-             Rails.cache.write("saltkeys_#{proxy.id}", keys, {:expires_in => 1.minute }) if Rails.env.production?
-           end
-           keys
-         end
+          Rails.cache.write("saltkeys_#{proxy.id}", keys, :expires_in => 1.minute) if Rails.env.production?
+        end
+        keys
+      end
 
-         def find(proxy, name)
-           all(proxy).select{|c| c.name == name}.first
-         end
+      def find(proxy, name)
+        all(proxy).select { |c| c.name == name }.first
+      end
 
-         def find_by_state(proxy, state)
-           all(proxy).select{|c| c.state == state}
-         end
-       end
+      def find_by_state(proxy, state)
+        all(proxy).select { |c| c.state == state }
+      end
+    end
 
     def accept
       raise ::Foreman::Exception.new(N_('unable to re-accept an accepted key')) unless state == 'unaccepted'
       proxy = SmartProxy.find(smart_proxy_id)
       Rails.cache.delete("saltkeys_#{proxy.id}") if Rails.env.production?
-      ProxyAPI::Salt.new({:url => proxy.url}).key_accept name
+      ProxyAPI::Salt.new(:url => proxy.url).key_accept name
     end
 
     def reject
       raise ::Foreman::Exception.new(N_('unable to reject an accepted key')) unless state == 'unaccepted'
       proxy = SmartProxy.find(smart_proxy_id)
       Rails.cache.delete("saltkeys_#{proxy.id}") if Rails.env.production?
-      ProxyAPI::Salt.new({:url => proxy.url}).key_reject name
+      ProxyAPI::Salt.new(:url => proxy.url).key_reject name
     end
 
-
     def delete
       proxy = SmartProxy.find(smart_proxy_id)
       Rails.cache.delete("saltkeys_#{proxy.id}") if Rails.env.production?
-      ProxyAPI::Salt.new({:url => proxy.url}).key_delete name
+      ProxyAPI::Salt.new(:url => proxy.url).key_delete name
     end
 
     def to_param
@@ -62,7 +59,7 @@ module ForemanSalt
     end
 
     def <=>(other)
-      self.name <=> other.name
+      name <=> other.name
     end
   end
 end

data/app/views/foreman_salt/api/v2/salt_autosign/base.json.rabl

@@ -0,0 +1,3 @@
+object @salt_autosign
+
+attributes :record

data/app/views/foreman_salt/api/v2/salt_autosign/create.json.rabl

@@ -0,0 +1,3 @@
+object @salt_autosign
+
+extends "foreman_salt/api/v2/salt_autosign/main"

data/app/views/foreman_salt/api/v2/salt_autosign/index.json.rabl

@@ -0,0 +1,3 @@
+collection @salt_autosigns
+
+extends 'foreman_salt/api/v2/salt_autosign/main'

data/app/views/foreman_salt/api/v2/salt_autosign/main.json.rabl

@@ -0,0 +1,3 @@
+object @salt_autosign
+
+extends 'foreman_salt/api/v2/salt_autosign/base'

data/app/views/foreman_salt/api/v2/salt_environments/base.json.rabl

@@ -0,0 +1,3 @@
+object @salt_environment
+
+attributes :id, :name

data/app/views/foreman_salt/api/v2/salt_environments/create.json.rabl

@@ -0,0 +1,3 @@
+object @salt_environment
+
+extends "foreman_salt/api/v2/salt_environments/main"

data/app/views/foreman_salt/api/v2/salt_environments/index.json.rabl

@@ -0,0 +1,3 @@
+collection @salt_environments
+
+extends 'foreman_salt/api/v2/salt_environments/main'

data/app/views/foreman_salt/api/v2/salt_environments/main.json.rabl

@@ -0,0 +1,3 @@
+object @salt_environment
+
+extends 'foreman_salt/api/v2/salt_environments/base'

data/app/views/foreman_salt/api/v2/salt_environments/show.json.rabl

@@ -0,0 +1,3 @@
+object @salt_environment
+
+extends "foreman_salt/api/v2/salt_environments/base"

data/app/views/foreman_salt/api/v2/salt_keys/base.json.rabl

@@ -0,0 +1,3 @@
+object @salt_key
+
+attributes :name, :state, :fingerprint

data/app/views/foreman_salt/api/v2/salt_keys/index.json.rabl

@@ -0,0 +1,3 @@
+collection @salt_keys
+
+extends 'foreman_salt/api/v2/salt_keys/main'

data/app/views/foreman_salt/api/v2/salt_keys/main.json.rabl

@@ -0,0 +1,3 @@
+object @salt_key
+
+extends 'foreman_salt/api/v2/salt_keys/base'

data/app/views/foreman_salt/api/v2/salt_keys/update.json.rabl

@@ -0,0 +1,3 @@
+object @salt_key
+
+extends "foreman_salt/api/v2/salt_keys/main"

data/app/views/foreman_salt/api/v2/salt_minions/base.json.rabl

@@ -0,0 +1,3 @@
+object @salt_minion
+
+attributes :id, :name, :salt_environment_id, :salt_environment_name, :salt_proxy_name, :salt_proxy_id

data/app/views/foreman_salt/api/v2/salt_minions/index.json.rabl

@@ -0,0 +1,3 @@
+collection @salt_minions
+
+extends 'foreman_salt/api/v2/salt_minions/base'

data/app/views/foreman_salt/api/v2/salt_minions/main.json.rabl

@@ -0,0 +1,3 @@
+object @salt_minion
+
+extends 'foreman_salt/api/v2/salt_minions/base'

data/app/views/foreman_salt/api/v2/salt_minions/show.json.rabl

@@ -0,0 +1,8 @@
+object @salt_minion
+
+extends "foreman_salt/api/v2/salt_minions/main"
+
+child :salt_modules => :salt_states do
+  extends "foreman_salt/api/v2/salt_states/base"
+end
+

data/app/views/foreman_salt/api/v2/salt_states/base.json.rabl

@@ -0,0 +1,3 @@
+object @salt_state
+
+attributes :id, :name

data/app/views/foreman_salt/api/v2/salt_states/create.json.rabl

@@ -0,0 +1,3 @@
+object @salt_state
+
+extends "foreman_salt/api/v2/salt_states/main"

data/app/views/foreman_salt/api/v2/salt_states/index.json.rabl

@@ -0,0 +1,3 @@
+collection @salt_states
+
+extends 'foreman_salt/api/v2/salt_states/main'

data/app/views/foreman_salt/api/v2/salt_states/main.json.rabl

@@ -0,0 +1,3 @@
+object @salt_state
+
+extends 'foreman_salt/api/v2/salt_states/base'

data/app/views/foreman_salt/api/v2/salt_states/show.json.rabl

@@ -0,0 +1,3 @@
+object @salt_state
+
+extends "foreman_salt/api/v2/salt_states/base"

data/config/routes.rb

@@ -1,7 +1,9 @@
 Rails.application.routes.draw do
-
   scope :salt, :path => '/salt' do
-    match '/node/:name' => 'hosts#salt_external_node', :constraints => { :name => /[^\.][\w\.-]+/ }
+    constraints(:id => /[\w\.-]+/) do
+      match '/node/:id' => 'foreman_salt/minions#node'
+      match '/run/:id'  => 'foreman_salt/minions#run'
+    end
 
     resources :salt_environments, :controller => 'foreman_salt/salt_environments' do
       collection do
@@ -15,8 +17,27 @@ Rails.application.routes.draw do
       end
     end
 
-    scope :api, :defaults => {:format => 'json'}, :constraints => ApiConstraints.new(:version => 2) do
-      match 'api/v2/jobs/upload' => 'foreman_salt/api/v2/jobs#upload', :via => :post
+    scope :api, :path => '/api', :defaults => { :format => 'json' } do
+      scope '(:apiv)', :defaults => { :apiv => 'v2' },
+                       :apiv => /v1|v2/, :constraints => ApiConstraints.new(:version => 2) do
+        match '/jobs/upload' => 'foreman_salt/api/v2/jobs#upload', :via => :post
+
+        constraints(:smart_proxy_id => /[\w\.-]+/, :name => /[\w\.-]+/, :record => /[^\/]+/) do
+          match '/salt_keys/:smart_proxy_id' => 'foreman_salt/api/v2/salt_keys#index', :via => :get
+          match '/salt_keys/:smart_proxy_id/:name' => 'foreman_salt/api/v2/salt_keys#update', :via => :put
+          match '/salt_keys/:smart_proxy_id/:name' => 'foreman_salt/api/v2/salt_keys#destroy', :via => :delete
+
+          match '/salt_autosign/:smart_proxy_id' => 'foreman_salt/api/v2/salt_autosign#index', :via => :get
+          match '/salt_autosign/:smart_proxy_id' => 'foreman_salt/api/v2/salt_autosign#create', :via => :post
+          match '/salt_autosign/:smart_proxy_id/:record' => 'foreman_salt/api/v2/salt_autosign#destroy', :via => :delete
+        end
+
+        constraints(:id => /[\w\.-]+/) do
+          resources :salt_environments, :only => [:show, :index, :create, :destroy], :controller => 'foreman_salt/api/v2/salt_environments'
+          resources :salt_minions, :only => [:show, :index, :update], :controller => 'foreman_salt/api/v2/salt_minions'
+          resources :salt_states, :only => [:show, :index, :create, :destroy], :controller => 'foreman_salt/api/v2/salt_states'
+        end
+      end
     end
   end
 
@@ -31,12 +52,4 @@ Rails.application.routes.draw do
       end
     end
   end
-
-  constraints(:id => /[^\/]+/) do
-    resources :hosts do
-      member do
-        get :saltrun
-      end
-    end
-  end
 end

data/db/migrate/20140813081913_add_salt_proxy_to_host_and_host_group.rb

@@ -8,5 +8,4 @@ class AddSaltProxyToHostAndHostGroup < ActiveRecord::Migration
     remove_column :hosts, :salt_proxy_id
     remove_column :hostgroups, :salt_proxy_id
   end
-
 end