Skip to content

Commit bd951de

Browse files
committed
Editing
Signed-off-by: Ian Maddaus <[email protected]>
1 parent 5368c47 commit bd951de

File tree

1 file changed

+10
-20
lines changed

1 file changed

+10
-20
lines changed

content/360/saas/get_started/enroll_nodes.md

+10-20
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ To enroll a Windows node, follow these steps:
120120
121121
## Cookbook-based enrollment
122122
123-
With cookbook-based enrollment, you enroll nodes from the client side by uploading a [cookbook](https://docs.chef.io/cookbooks/) with enrollment settings to Chef Infra Server and then Chef Infra Client enrolls the node with Chef 360 SaaS.
123+
With cookbook-based enrollment, you enroll nodes from the client side by uploading a [cookbook](/cookbooks/) with enrollment settings to Chef Infra Server and then Chef Infra Client enrolls the node with Chef 360 SaaS.
124124
125125
### Enroll nodes with a cookbook
126126
@@ -144,13 +144,13 @@ To configure the cookbooks and define enrollment settings, follow these steps:
144144
chef generate cookbook <COOKBOOK_NAME>
145145
```
146146
147-
In the [`metadata.rb` file](https://docs.chef.io/config_rb_metadata/) of your wrapper cookbook, add the following dependency to include the `chef-cookbook-enroll` cookbook:
147+
In the [`metadata.rb` file](/config_rb_metadata/) of your wrapper cookbook, add the following dependency to include the `chef-cookbook-enroll` cookbook:
148148
149149
```ruby
150150
depends 'chef360-node-enroll', '~> 1.0.0'
151151
```
152152
153-
1. Create a copy of the Chef 360 SaaS public key and add it to the wrapper cookbook's `files` directory:
153+
1. Copy of the Chef 360 SaaS public key and add it to your wrapper cookbook:
154154
155155
```plaintext
156156
-----BEGIN CERTIFICATE-----
@@ -178,14 +178,6 @@ To configure the cookbooks and define enrollment settings, follow these steps:
178178
179179
This public key expires on March 18, 2029.
180180
181-
1. Create an attribute file that includes the path to the public key. For example:
182-
183-
```ruby
184-
default['enroll']['root_ca'] = '<COOKBOOK_NAME>/files/default/root_ca.pem'
185-
```
186-
187-
Replace `<COOKBOOK_NAME>` with the name of the wrapper cookbook.
188-
189181
1. Generate an access key and secret key:
190182
191183
```bash
@@ -216,8 +208,6 @@ To configure the cookbooks and define enrollment settings, follow these steps:
216208
}
217209
```
218210
219-
1. Store the access key and secret key using an [encrypted Chef data bag](https://docs.chef.io/data_bags/) or with a [secrets manager](https://docs.chef.io/infra_language/secrets/).
220-
221211
1. Define the `node_management_enroll` resource in your wrapper cookbook's recipe:
222212

223213
```ruby
@@ -229,8 +219,8 @@ To configure the cookbooks and define enrollment settings, follow these steps:
229219
secret_key '<SECRET_KEY>'
230220
cohort_id '<COHORT_ID>'
231221
hab_builder_url '<HABITAT_BUILDER_URL>'
232-
working_dir_path '<VALID_DIR_PATH>'
233222
root_ca <CHEF_360_SAAS_PUBLIC_KEY>
223+
working_dir_path '<VALID_DIR_PATH>'
234224
upgrade_skills <UPGRADE_SKILLS>
235225
end
236226
```
@@ -240,30 +230,30 @@ To configure the cookbooks and define enrollment settings, follow these steps:
240230
- `<CHEF_360_FQDN>` with the fully qualified domain name (FQDN) for your Chef 360 SaaS deployment.
241231
- `<ENROLLMENT_TYPE>` with either `full` or `partial` depending on the form of enrollment. Use `full` unless you must `partial`.
242232
- `<API_PORT>` with the API port configured in Chef 360 SaaS. The default value is `31000`.
243-
- `<ACCESS_KEY>` with the access key for secure communication with Chef 360 SaaS.
244-
- `<SECRET_KEY>` with the secret key for secure communication with Chef 360 SaaS.
233+
- `<ACCESS_KEY>` with the access key for secure communication with Chef 360 SaaS. This should be stored using an [encrypted Chef data bag](/data_bags/) or [secrets manager](/infra_language/secrets/).
234+
- `<SECRET_KEY>` with the secret key for secure communication with Chef 360 SaaS. This should be stored using an [encrypted Chef data bag](/data_bags/) or [secrets manager](/infra_language/secrets/).
245235
- `<COHORT_ID>` with a valid cohort UUID. The cohort defines all skills and settings installed on the node.
246236
- `<HABITAT_BUILDER_URL>` with the URL of the Chef Habitat Builder used by your organization. Default value: `https://bldr.habitat.sh`
237+
- `<CHEF_360_SAAS_PUBLIC_KEY>` if TLS is enabled, with the root CA public key. For example, `node['enroll']['root_ca']`.
247238
- `<VALID_DIR_PATH>` with a temporary working directory where all required builds are downloaded. Specify a valid path based on the OS. Default value: `/tmp`.
248-
- `<CHEF_360_SAAS_PUBLIC_KEY>` with the attribute for the root CA public key. For example, `node['enroll']['root_ca']`.
249239
- `<UPGRADE_SKILLS>` with `true` or `false`. If `true`, Chef 360 SaaS checks for the latest skill versions and installs them if found. Default value: `false`.
250240

251241
1. Push the wrapper cookbook or policy to the Chef Infra Server.
252242

253-
1. If you're using a role, [upload](https://docs.chef.io/workstation/knife_cookbook/#upload) the wrapper cookbook to the Chef Infra Server:
243+
1. If you're using a role, [upload](/workstation/knife_cookbook/#upload) the wrapper cookbook to the Chef Infra Server:
254244
255245
```bash
256246
knife cookbook upload <WRAPPER_COOKBOOK_NAME> --cookbook-path <WRAPPER_COOKBOOK_DIR_PATH>
257247
```
258248
259-
1. If you're using a Policyfile, [create `Policyfile.lock.json` file](https://docs.chef.io/workstation/ctl_chef/#chef-install) and [push](https://docs.chef.io/workstation/ctl_chef/#chef-push) the Policyfile to Chef Infra Server:
249+
1. If you're using a Policyfile, [create `Policyfile.lock.json` file](/workstation/ctl_chef/#chef-install) and [push](/workstation/ctl_chef/#chef-push) the Policyfile to Chef Infra Server:
260250

261251
```bash
262252
chef install
263253
chef push <POLICY_GROUP> <POLICYFILE>
264254
```
265255

266-
1. Include the wrapper cookbook in your node's run-list by adding it to a role or Policyfile. See the [run-list](https://docs.chef.io/run_lists/) and [role](https://docs.chef.io/roles/#manage-roles) documentation for more information.
256+
1. Include the wrapper cookbook in your node's run-list by adding it to a role or Policyfile. See the [run-list](/run_lists/) and [role](/roles/#manage-roles) documentation for more information.
267257
268258
The next time Chef Infra Client runs, it executes the `node_management_enroll` resource and the node is enrolled with Chef 360 SaaS.
269259

0 commit comments

Comments
 (0)