diff options
author | John Keiser <john@johnkeiser.com> | 2016-01-27 10:55:27 -0800 |
---|---|---|
committer | John Keiser <john@johnkeiser.com> | 2016-01-27 11:23:10 -0800 |
commit | b857d3a1680269e12611cfa5931baafebc7eb6d3 (patch) | |
tree | e5277d1e88ddc52838cfea188161fbacfa23487e | |
parent | adf5c3412787e04f7e4347e160c5b33ef6cfad5e (diff) | |
download | chef-b857d3a1680269e12611cfa5931baafebc7eb6d3.tar.gz |
Set ec2 as the default
-rw-r--r-- | acceptance/README.md | 2 | ||||
-rw-r--r-- | acceptance/cookbook-git/.acceptance/acceptance-cookbook/libraries/init.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/acceptance/README.md b/acceptance/README.md index 19bd535548..185d92802f 100644 --- a/acceptance/README.md +++ b/acceptance/README.md @@ -37,7 +37,7 @@ The steps you will need to do are: 2. Create or import a SSH key to AWS. Make sure the key name is the same as the username. 3. Copy or move the private key file (USERNAME.pem) to the SSH folder (e.g. `~/.ssh/`. Change the mode so that the file is only read-able by root (E.g.: chmod 0400 USERNAME.pem) -4. Set up the KITCHEN_DRIVER environment variable appropriately (value should be "ec2"). E.g.: +4. Set up the KITCHEN_DRIVER environment variable appropriately (value should be "ec2"). (This is optional, as ec2 is the default.) E.g.: ``` export KITCHEN_DRIVER=ec2 ``` diff --git a/acceptance/cookbook-git/.acceptance/acceptance-cookbook/libraries/init.rb b/acceptance/cookbook-git/.acceptance/acceptance-cookbook/libraries/init.rb index d40d6672e7..d3d3db451e 100644 --- a/acceptance/cookbook-git/.acceptance/acceptance-cookbook/libraries/init.rb +++ b/acceptance/cookbook-git/.acceptance/acceptance-cookbook/libraries/init.rb @@ -16,4 +16,4 @@ module CookbookGit end end -ENV["KITCHEN_LOCAL_YAML"] ||= File.join(Chef.node["chef-acceptance"]["suite-dir"], ".kitchen.#{ENV["KITCHEN_DRIVER"] || "vagrant"}.yml") +ENV["KITCHEN_LOCAL_YAML"] ||= File.join(Chef.node["chef-acceptance"]["suite-dir"], ".kitchen.#{ENV["KITCHEN_DRIVER"] || "ec2"}.yml") |