Revert "Fixes #8409 - Pull docker image asynchronously"

This reverts commit 16234b2. Conflicts: app/models/service/containers.rb
theforeman · Jan 28, 2015 · e054355 · e054355
1 parent 63ae5d9
commit e054355
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 28 deletions.
diff --git a/app/models/container.rb b/app/models/container.rb
@@ -1,7 +1,6 @@
 class Container < ActiveRecord::Base
   include Authorizable
   include Taxonomix
-  include ForemanTasks::Concerns::ActionSubject
 
   belongs_to :compute_resource
   belongs_to :registry, :class_name => "DockerRegistry", :foreign_key => :registry_id

diff --git a/app/models/service/actions/compute_resource/pull.rb b/app/models/service/actions/compute_resource/pull.rb
diff --git a/foreman_docker.gemspec b/foreman_docker.gemspec
@@ -20,6 +20,5 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'docker-api', '~> 1.13'
   s.add_dependency 'wicked', '~> 1.1'
-  s.add_dependency 'foreman-tasks'
   s.add_development_dependency 'rubocop', '~> 0.26'
 end
diff --git a/lib/foreman_docker/engine.rb b/lib/foreman_docker/engine.rb
@@ -14,11 +14,6 @@ class Engine < ::Rails::Engine
     config.autoload_paths += Dir["#{config.root}/app/controllers/concerns"]
     config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
 
-    initializer "foreman_docker.require_dynflow",
-                :before => "foreman_tasks.initialize_dynflow" do |app|
-      ForemanTasks.dynflow.require!
-    end
-
     initializer 'foreman_docker.load_app_instance_data' do |app|
       app.config.paths['db/migrate'] += ForemanDocker::Engine.paths['db/migrate'].existent
     end