summaryrefslogtreecommitdiff
path: root/DOC_CHANGES.md
diff options
context:
space:
mode:
authorClaire McQuin <claire@getchef.com>2015-07-16 14:53:11 -0700
committerClaire McQuin <claire@getchef.com>2015-07-16 14:53:11 -0700
commit14075fd8ac3dd08e80d0e2da08403afbecf798e0 (patch)
treec72e58f784d874e24af44362717c9d4227140782 /DOC_CHANGES.md
parent64e0a1da0826f5befababb5693d8bb5b8de913e9 (diff)
downloadchef-14075fd8ac3dd08e80d0e2da08403afbecf798e0.tar.gz
Update documentation for chef-client -j JSONmcquin/first-boot-chef-environment
Diffstat (limited to 'DOC_CHANGES.md')
-rw-r--r--DOC_CHANGES.md16
1 files changed, 16 insertions, 0 deletions
diff --git a/DOC_CHANGES.md b/DOC_CHANGES.md
index b1121e2bf4..92a178e20b 100644
--- a/DOC_CHANGES.md
+++ b/DOC_CHANGES.md
@@ -6,3 +6,19 @@ Example Doc Change:
Description of the required change.
-->
+### chef-client -j JSON
+Add to the [description of chef-client options](https://docs.chef.io/ctl_chef_client.html#options):
+
+> This option can also be used to set a node's `chef_environment`. For example,
+running `chef-client -j /path/to/file.json` where `/path/to/file.json` is
+similar to:
+```
+{
+ "chef_environment": "pre-production"
+}
+```
+will set the node's environment to `"pre-production"`.
+
+> *Note that the environment specified by `chef_environment` in your JSON will
+take precedence over an environment specified by `-E ENVIROMENT` when both options
+are provided.*