follow comment of #3900

2 files changed, 13 insertions, 12 deletions

diff --git a/lib/chef/exceptions.rb b/lib/chef/exceptions.rb
index 2d60faa0c9..855c86d9cc 100644
--- a/lib/chef/exceptions.rb
+++ b/lib/chef/exceptions.rb
@@ -74,7 +74,11 @@ class Chef
     class InvalidPrivateKey < ArgumentError; end
     class MissingKeyAttribute < ArgumentError; end
     class KeyCommandInputError < ArgumentError; end
-    class BootstrapCommandInputError < ArgumentError; end
+    class BootstrapCommandInputError < ArgumentError
+      def initialize
+        super "You cannot pass both --json-attributes and --json-attribute-file. Please pass one or none."
+      end
+    end
     class InvalidKeyArgument < ArgumentError; end
     class InvalidKeyAttribute < ArgumentError; end
     class InvalidUserAttribute < ArgumentError; end
diff --git a/lib/chef/knife/bootstrap.rb b/lib/chef/knife/bootstrap.rb
index b116ce3866..8502ccb8eb 100644
--- a/lib/chef/knife/bootstrap.rb
+++ b/lib/chef/knife/bootstrap.rb
@@ -169,7 +169,7 @@ class Chef
         :long => "--json-attributes",
         :description => "A JSON string to be added to the first run of chef-client",
         :proc => lambda { |o| Chef::JSONCompat.parse(o) },
-        :default => {}
+        :default => nil
 
       option :first_boot_attributes_from_file,
         :long => "--json-attribute-file FILE",
@@ -259,13 +259,6 @@ class Chef
         )
       end
 
-      def jsonstring_and_jsonfile_msg
-<<EOS
-You cannot pass both --json-attributes and --json-attribute-file.
-Please pass one or none.
-EOS
-      end
-
       # The default bootstrap template to use to bootstrap a server This is a public API hook
       # which knife plugins use or inherit and override.
       #
@@ -347,16 +340,20 @@ EOS
         )
       end
 
+      def first_boot_attributes
+        @config[:first_boot_attributes] || @config[:first_boot_attributes_from_file] || {}
+      end
+
       def render_template
-        @config[:first_boot_attributes].merge!(@config[:first_boot_attributes_from_file]) if @config[:first_boot_attributes_from_file]
+        @config[:first_boot_attributes] = first_boot_attributes
         template_file = find_template
         template = IO.read(template_file).chomp
         Erubis::Eruby.new(template).evaluate(bootstrap_context)
       end
 
       def run
-        if @config[:first_boot_attributes].any? && @config[:first_boot_attributes_from_file]
-          raise Chef::Exceptions::BootstrapCommandInputError, jsonstring_and_jsonfile_msg
+        if @config[:first_boot_attributes] && @config[:first_boot_attributes_from_file]
+          raise Chef::Exceptions::BootstrapCommandInputError
         end
 
         validate_name_args!