(#6928) Removed --ignoreimport

This was only used with --parseonly, which is gone.

Paired-With: Jesse Wolfe

3 files changed, 10 insertions, 4 deletions

diff --git a/lib/puppet/application/agent.rb b/lib/puppet/application/agent.rb
index fc8616817..317a61436 100644
--- a/lib/puppet/application/agent.rb
+++ b/lib/puppet/application/agent.rb
@@ -429,10 +429,6 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
 
     Puppet.settings.use :main, :agent, :ssl
 
-    # Always ignoreimport for agent. It really shouldn't even try to import,
-    # but this is just a temporary band-aid.
-    Puppet[:ignoreimport] = true
-
     # We need to specify a ca location for all of the SSL-related i
     # indirected classes to work; in fingerprint mode we just need
     # access to the local files and we don't need a ca.
diff --git a/lib/puppet/application/apply.rb b/lib/puppet/application/apply.rb
index 5779e799c..a63c2ddae 100644
--- a/lib/puppet/application/apply.rb
+++ b/lib/puppet/application/apply.rb
@@ -31,6 +31,11 @@ class Puppet::Application::Apply < Puppet::Application
     exit 1
   end
 
+  option("--ignoreimport") do
+    puts "--ignoreimport has been removed. Please use 'puppet parser validate <manifest>'"
+    exit 1
+  end
+
   def help
     <<-HELP
 
diff --git a/lib/puppet/application/master.rb b/lib/puppet/application/master.rb
index a90829ae0..924e671fb 100644
--- a/lib/puppet/application/master.rb
+++ b/lib/puppet/application/master.rb
@@ -30,6 +30,11 @@ class Puppet::Application::Master < Puppet::Application
     exit 1
   end
 
+  option("--ignoreimport") do
+    puts "--ignoreimport has been removed. Please use 'puppet parser validate <manifest>'"
+    exit 1
+  end
+
   def help
     <<-HELP