diff options
| author | Marc A. Paradise <marc.paradise@gmail.com> | 2019-03-05 06:00:24 -0500 |
|---|---|---|
| committer | Marc A. Paradise <marc.paradise@gmail.com> | 2019-03-19 14:25:11 -0400 |
| commit | 43fd40e799ec9d58ffe390d25acb61e02f45b64b (patch) | |
| tree | 377b6b417f725b5803fce47170b2a3434ae28bed | |
| parent | ac56ddb1e1db3be29023a17de3d5e8324814f794 (diff) | |
| download | chef-43fd40e799ec9d58ffe390d25acb61e02f45b64b.tar.gz | |
Finish moving options to mixin. Clean banner.
Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>
| -rw-r--r-- | lib/chef/knife/bootstrap.rb | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lib/chef/knife/bootstrap.rb b/lib/chef/knife/bootstrap.rb index 105bd42e08..e0b2124f68 100644 --- a/lib/chef/knife/bootstrap.rb +++ b/lib/chef/knife/bootstrap.rb @@ -1,6 +1,6 @@ # # Author:: Adam Jacob (<adam@chef.io>) -# Copyright:: Copyright 2010-2016, Chef Software Inc. +# Copyright:: Copyright 2010-2019, Chef Software Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -22,12 +22,17 @@ require "erubis" require "chef/knife/bootstrap/chef_vault_handler" require "chef/knife/bootstrap/client_builder" require "chef/util/path_helper" +require "chef/knife/bootstrap/options" class Chef class Knife class Bootstrap < Knife include DataBagSecretOptions + # Command line flags and options for bootstrap - there's a large number of them + # so we'll keep this file a little smaller by splitting them out. + include Bootstrap::Options + attr_accessor :client_builder attr_accessor :chef_vault_handler attr_reader :target_host @@ -38,18 +43,14 @@ class Chef require "tempfile" require "chef_core/text" # i18n and standardized error structures require "chef_core/target_host" - - # Command line flags and options for bootstrap - there's a large number of them - # so we'll keep this file a little smaller by splitting them out. - require "chef/knife/bootstrap/options" - self.include Chef::Knife::Bootstrap::Options + require "chef_core/target_resolver" # Because nothing else is using i18n out of Chef::Text yet, we're treating it # as a dependency to avoid loading localization files before we need them. ChefCore::Text.add_gem_localization("chef") end - banner "knife bootstrap [SSH_USER@]FQDN (options)" + banner "knife bootstrap [PROTOCOL://][USER@]FQDN (options)" def initialize(argv = []) super |