Don't pass -E to chef-client unless given an environment

Chef::PolicyBuilder::Policyfile requires `Chef::Config[:environment]` to
be nil or empty, in order to prevent confusion that could arise from
using two conflicting features. Because `chef-client` merges CLI options
to `Chef::Config` automatically, running `chef-cient -E _default` causes
`Chef::Config[:environment]` to be non-nil, resulting in chef-client
emitting this error when bootstrapping:

```
192.168.99.143 Unexpected Error:
192.168.99.143 -----------------
192.168.99.143 Chef::PolicyBuilder::Policyfile::UnsupportedFeature:
Policyfile does not work with Chef Environments
```
For non-policyfile users, this should behave the same as before since
Chef will just default to the `_default` environment (this gets set via
Node#initialize) if none is specified.

1 files changed, 4 insertions, 4 deletions

diff --git a/spec/unit/knife/core/bootstrap_context_spec.rb b/spec/unit/knife/core/bootstrap_context_spec.rb
index a93e5362a9..0433ef9983 100644
--- a/spec/unit/knife/core/bootstrap_context_spec.rb
+++ b/spec/unit/knife/core/bootstrap_context_spec.rb
@@ -38,14 +38,14 @@ describe Chef::Knife::Core::BootstrapContext do
     expect{described_class.new(config, run_list, chef_config)}.not_to raise_error
   end
 
-  it "runs chef with the first-boot.json in the _default environment" do
-    expect(bootstrap_context.start_chef).to eq "chef-client -j /etc/chef/first-boot.json -E _default"
+  it "runs chef with the first-boot.json with no environment specified" do
+    expect(bootstrap_context.start_chef).to eq "chef-client -j /etc/chef/first-boot.json"
   end
 
   describe "when in verbosity mode" do
     let(:config) { {:verbosity => 2} }
     it "adds '-l debug' when verbosity is >= 2" do
-      expect(bootstrap_context.start_chef).to eq "chef-client -j /etc/chef/first-boot.json -l debug -E _default"
+      expect(bootstrap_context.start_chef).to eq "chef-client -j /etc/chef/first-boot.json -l debug"
     end
   end
 
@@ -70,7 +70,7 @@ EXPECTED
   describe "alternate chef-client path" do
     let(:chef_config){ {:chef_client_path => '/usr/local/bin/chef-client'} }
     it "runs chef-client from another path when specified" do
-      expect(bootstrap_context.start_chef).to eq "/usr/local/bin/chef-client -j /etc/chef/first-boot.json -E _default"
+      expect(bootstrap_context.start_chef).to eq "/usr/local/bin/chef-client -j /etc/chef/first-boot.json"
     end
   end