diff --git a/lib/chef-cli/skeletons/code_generator/files/default/build_cookbook/README.md b/lib/chef-cli/skeletons/code_generator/files/default/build_cookbook/README.md index 26d26496b..73598274e 100644 --- a/lib/chef-cli/skeletons/code_generator/files/default/build_cookbook/README.md +++ b/lib/chef-cli/skeletons/code_generator/files/default/build_cookbook/README.md @@ -101,7 +101,7 @@ cd .delivery/build_cookbook kitchen converge ``` -This will take awhile because it will now pass on the first VM, and then create the second VM. We should have warned you this was a good time for a coffee break. +This will take a while because it will now pass on the first VM, and then create the second VM. We should have warned you this was a good time for a coffee break. ``` Recipe: test::default @@ -115,7 +115,7 @@ Recipe: test::default Running handlers: Running handlers complete Chef Infra Client finished, 3/32 resources updated in 54.665445968 seconds -Finished converging (1m26.83s). +Finished converging (1m26.83s). ``` Victory is ours! Our verify phase passed on the build nodes. @@ -129,7 +129,7 @@ delivery review ## FAQ -### Why don't I just run rspec and foodcritic/cookstyle on my local system? +### Why don't I just run rspec and cookstyle on my local system? An objection to the Test Kitchen approach is that it is much faster to run the unit, lint, and syntax commands for the project on the local system. That is totally true, and also totally valid. Do that for the really fast feedback loop. However, the dance we do with Test Kitchen brings a much higher degree of confidence in the changes we're making, that everything will run on the build nodes in Chef Workflow. We strongly encourage this approach before actually pushing the changes to Workflow. diff --git a/lib/chef-cli/skeletons/code_generator/files/default/chefignore b/lib/chef-cli/skeletons/code_generator/files/default/chefignore index 5039e1c35..5fdd33dc4 100644 --- a/lib/chef-cli/skeletons/code_generator/files/default/chefignore +++ b/lib/chef-cli/skeletons/code_generator/files/default/chefignore @@ -97,7 +97,7 @@ Gemfile.lock Policyfile.rb Policyfile.lock.json -# Cookbooks # +# Documentation # ############# CHANGELOG* CONTRIBUTING* diff --git a/lib/chef-cli/skeletons/code_generator/files/default/cookbook_readmes/README-policy.md b/lib/chef-cli/skeletons/code_generator/files/default/cookbook_readmes/README-policy.md index 7a2f39f22..cb4d73cec 100644 --- a/lib/chef-cli/skeletons/code_generator/files/default/cookbook_readmes/README-policy.md +++ b/lib/chef-cli/skeletons/code_generator/files/default/cookbook_readmes/README-policy.md @@ -1,4 +1,4 @@ -This directory typically contains Chef cookbooks. This repository was +This directory typically contains Chef Infra cookbooks. This repository was generated with the '--policy-only' option, which means you have chosen to use a workflow where each cookbook is treated as an independent software project. As a result, any cookbooks present in this directory diff --git a/lib/chef-cli/skeletons/code_generator/files/default/cookbook_readmes/README.md b/lib/chef-cli/skeletons/code_generator/files/default/cookbook_readmes/README.md index 90c40ee4f..9bad73416 100644 --- a/lib/chef-cli/skeletons/code_generator/files/default/cookbook_readmes/README.md +++ b/lib/chef-cli/skeletons/code_generator/files/default/cookbook_readmes/README.md @@ -1,4 +1,4 @@ -This directory contains the cookbooks used to configure systems in your infrastructure with Chef - an example basic cookbook called `example` has been automatically created for you. +This directory contains the cookbooks used to configure systems in your infrastructure with Chef Infra - an example basic cookbook called `example` has been automatically created for you. Knife needs to be configured to know where the cookbooks are located with the `cookbook_path` setting. If this is not set, then several cookbook operations will fail to work properly. @@ -23,7 +23,7 @@ cookbook_email "cookbooks@example.com" cookbook_license "apachev2" ``` -Supported values for `cookbook_license` are "apachev2", "mit","gplv2","gplv3", or "none". These settings are used to prefill comments in the default recipe, and the corresponding values in the metadata.rb. You are free to change the the comments in those files. +Supported values for `cookbook_license` are "apachev2", "mit","gplv2","gplv3", or "none". These settings are used to prefill comments in the default recipe, and the corresponding values in the metadata.rb. You are free to change the comments in those files. Create new cookbooks in this directory with Chef. diff --git a/lib/chef-cli/skeletons/code_generator/files/default/repo/cookbooks/example/README.md b/lib/chef-cli/skeletons/code_generator/files/default/repo/cookbooks/example/README.md index 27f5391f6..f09e6574e 100644 --- a/lib/chef-cli/skeletons/code_generator/files/default/repo/cookbooks/example/README.md +++ b/lib/chef-cli/skeletons/code_generator/files/default/repo/cookbooks/example/README.md @@ -4,11 +4,11 @@ An example cookbook ## Requirements -### Platforms: +### Platforms _No platforms defined_ -### Cookbooks: +### Cookbooks _No dependencies defined_ diff --git a/lib/chef-cli/skeletons/code_generator/templates/default/kitchen.yml.erb b/lib/chef-cli/skeletons/code_generator/templates/default/kitchen.yml.erb index 05e7faf3d..822403c16 100644 --- a/lib/chef-cli/skeletons/code_generator/templates/default/kitchen.yml.erb +++ b/lib/chef-cli/skeletons/code_generator/templates/default/kitchen.yml.erb @@ -26,7 +26,7 @@ verifier: platforms: - name: ubuntu-18.04 - - name: centos-7 + - name: centos-8 suites: - name: default diff --git a/lib/chef-cli/skeletons/code_generator/templates/default/kitchen_dokken.yml.erb b/lib/chef-cli/skeletons/code_generator/templates/default/kitchen_dokken.yml.erb index 1fd501c7c..09924ae5b 100644 --- a/lib/chef-cli/skeletons/code_generator/templates/default/kitchen_dokken.yml.erb +++ b/lib/chef-cli/skeletons/code_generator/templates/default/kitchen_dokken.yml.erb @@ -21,9 +21,9 @@ platforms: intermediate_instructions: - RUN /usr/bin/apt-get update - - name: centos-7 + - name: centos-8 driver: - image: dokken/centos-7 + image: dokken/centos-8 pid_one_command: /usr/lib/systemd/systemd suites: diff --git a/lib/chef-cli/skeletons/code_generator/templates/default/kitchen_policyfile.yml.erb b/lib/chef-cli/skeletons/code_generator/templates/default/kitchen_policyfile.yml.erb index e5bbf3c16..da3312271 100644 --- a/lib/chef-cli/skeletons/code_generator/templates/default/kitchen_policyfile.yml.erb +++ b/lib/chef-cli/skeletons/code_generator/templates/default/kitchen_policyfile.yml.erb @@ -22,7 +22,7 @@ verifier: platforms: - name: ubuntu-18.04 - - name: centos-7 + - name: centos-8 suites: - name: default diff --git a/spec/unit/command/generator_commands/cookbook_spec.rb b/spec/unit/command/generator_commands/cookbook_spec.rb index a7c2119f0..b02c46072 100644 --- a/spec/unit/command/generator_commands/cookbook_spec.rb +++ b/spec/unit/command/generator_commands/cookbook_spec.rb @@ -580,7 +580,7 @@ def with_argv(argv) platforms: - name: ubuntu-18.04 - - name: centos-7 + - name: centos-8 suites: - name: default @@ -667,7 +667,7 @@ def with_argv(argv) platforms: - name: ubuntu-18.04 - - name: centos-7 + - name: centos-8 suites: - name: default