summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2019-07-15 21:07:30 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2019-07-15 21:07:30 -0700
commitb55d95e6ad978663202d9f311576237aeab3e38f (patch)
tree2f1470503125b8a82fa84ad1d34a34f592bc5aa4
parentd37559196ac53de0aedfc1d48f19265c1613f21e (diff)
downloadchef-b55d95e6ad978663202d9f311576237aeab3e38f.tar.gz
copy --ez to base class
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
-rw-r--r--lib/chef/application/base.rb16
-rw-r--r--lib/chef/application/solo.rb15
2 files changed, 16 insertions, 15 deletions
diff --git a/lib/chef/application/base.rb b/lib/chef/application/base.rb
index cbbdae07c4..bfcfc4faef 100644
--- a/lib/chef/application/base.rb
+++ b/lib/chef/application/base.rb
@@ -181,6 +181,11 @@ class Chef::Application::Base < Chef::Application
description: "Only run the bare minimum Ohai plugins #{Chef::Dist::PRODUCT} needs to function.",
boolean: true
+ option :ez,
+ long: "--ez",
+ description: "A memorial for Ezra Zygmuntowicz.",
+ boolean: true
+
attr_reader :chef_client_json
def setup_application
@@ -211,4 +216,15 @@ class Chef::Application::Base < Chef::Application
"Please confirm the location of the tarball and try again."
end
end
+
+ def for_ezra
+ puts <<~EOH
+ For Ezra Zygmuntowicz:
+ The man who brought you Chef Solo
+ Early contributor to Chef
+ Kind hearted open source advocate
+ Rest in peace, Ezra.
+ EOH
+ end
+
end
diff --git a/lib/chef/application/solo.rb b/lib/chef/application/solo.rb
index caaa1e832e..3c9abd05de 100644
--- a/lib/chef/application/solo.rb
+++ b/lib/chef/application/solo.rb
@@ -43,11 +43,6 @@ class Chef::Application::Solo < Chef::Application::Base
long: "--recipe-url RECIPE_URL",
description: "Pull down a remote gzipped tarball of recipes and untar it to the cookbook cache."
- option :ez,
- long: "--ez",
- description: "A memorial for Ezra Zygmuntowicz.",
- boolean: true
-
option :delete_entire_chef_repo,
long: "--delete-entire-chef-repo",
description: "DANGEROUS: does what it says, only useful with --recipe-url.",
@@ -151,16 +146,6 @@ class Chef::Application::Solo < Chef::Application::Base
private
- def for_ezra
- puts <<~EOH
- For Ezra Zygmuntowicz:
- The man who brought you Chef Solo
- Early contributor to Chef
- Kind hearted open source advocate
- Rest in peace, Ezra.
- EOH
- end
-
def interval_run_chef_client
if Chef::Config[:daemonize]
Chef::Daemon.daemonize("#{Chef::Dist::CLIENT}")