chef 11.6.0.rc.1 → 11.6.0.rc.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/distro/common/html/chef-client.8.html +3 -3
- data/distro/common/html/chef-expander.8.html +3 -3
- data/distro/common/html/chef-expanderctl.8.html +3 -3
- data/distro/common/html/chef-server-webui.8.html +3 -3
- data/distro/common/html/chef-server.8.html +3 -3
- data/distro/common/html/chef-shell.1.html +3 -3
- data/distro/common/html/chef-solo.8.html +3 -3
- data/distro/common/html/chef-solr.8.html +3 -3
- data/distro/common/html/knife-bootstrap.1.html +3 -3
- data/distro/common/html/knife-client.1.html +3 -3
- data/distro/common/html/knife-configure.1.html +3 -3
- data/distro/common/html/knife-cookbook-site.1.html +3 -3
- data/distro/common/html/knife-cookbook.1.html +3 -3
- data/distro/common/html/knife-data-bag.1.html +3 -3
- data/distro/common/html/knife-environment.1.html +3 -3
- data/distro/common/html/knife-exec.1.html +3 -3
- data/distro/common/html/knife-index.1.html +3 -3
- data/distro/common/html/knife-node.1.html +3 -3
- data/distro/common/html/knife-role.1.html +3 -3
- data/distro/common/html/knife-search.1.html +3 -3
- data/distro/common/html/knife-ssh.1.html +3 -3
- data/distro/common/html/knife-status.1.html +3 -3
- data/distro/common/html/knife-tag.1.html +3 -3
- data/distro/common/html/knife.1.html +3 -3
- data/distro/common/man/man1/chef-shell.1 +1 -1
- data/distro/common/man/man1/knife-bootstrap.1 +1 -1
- data/distro/common/man/man1/knife-client.1 +1 -1
- data/distro/common/man/man1/knife-configure.1 +1 -1
- data/distro/common/man/man1/knife-cookbook-site.1 +1 -1
- data/distro/common/man/man1/knife-cookbook.1 +1 -1
- data/distro/common/man/man1/knife-data-bag.1 +1 -1
- data/distro/common/man/man1/knife-environment.1 +1 -1
- data/distro/common/man/man1/knife-exec.1 +1 -1
- data/distro/common/man/man1/knife-index.1 +1 -1
- data/distro/common/man/man1/knife-node.1 +1 -1
- data/distro/common/man/man1/knife-role.1 +1 -1
- data/distro/common/man/man1/knife-search.1 +1 -1
- data/distro/common/man/man1/knife-ssh.1 +1 -1
- data/distro/common/man/man1/knife-status.1 +1 -1
- data/distro/common/man/man1/knife-tag.1 +1 -1
- data/distro/common/man/man1/knife.1 +1 -1
- data/distro/common/man/man8/chef-client.8 +1 -1
- data/distro/common/man/man8/chef-expander.8 +1 -1
- data/distro/common/man/man8/chef-expanderctl.8 +1 -1
- data/distro/common/man/man8/chef-server-webui.8 +1 -1
- data/distro/common/man/man8/chef-server.8 +1 -1
- data/distro/common/man/man8/chef-solo.8 +1 -1
- data/distro/common/man/man8/chef-solr.8 +1 -1
- data/lib/chef/application/client.rb +0 -2
- data/lib/chef/application/solo.rb +0 -1
- data/lib/chef/application/windows_service.rb +0 -1
- data/lib/chef/client.rb +28 -6
- data/lib/chef/config.rb +1 -1
- data/lib/chef/exceptions.rb +2 -0
- data/lib/chef/knife/cookbook_site_share.rb +1 -0
- data/lib/chef/knife/cookbook_test.rb +1 -0
- data/lib/chef/provider/remote_file/cache_control_data.rb +8 -5
- data/lib/chef/resource_reporter.rb +5 -2
- data/lib/chef/version.rb +1 -1
- data/spec/unit/provider/remote_file/cache_control_data_spec.rb +9 -0
- data/spec/unit/resource_reporter_spec.rb +51 -0
- metadata +2 -2
@@ -133,11 +133,11 @@ option.</dd>
|
|
133
133
|
|
134
134
|
<h2 id="AUTHOR">AUTHOR</h2>
|
135
135
|
|
136
|
-
<p> Chef was written by Adam Jacob <a href="mai&#
|
136
|
+
<p> Chef was written by Adam Jacob <a href="mailto:adam@opscode.com" data-bare-link="true">adam@opscode.com</a> with many contributions from the community.</p>
|
137
137
|
|
138
138
|
<h2 id="DOCUMENTATION">DOCUMENTATION</h2>
|
139
139
|
|
140
|
-
<p> This manual page was written by Joshua Timberman <a href="mail&#
|
140
|
+
<p> This manual page was written by Joshua Timberman <a href="mailto:joshua@opscode.com" data-bare-link="true">joshua@opscode.com</a>.
|
141
141
|
Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
|
142
142
|
|
143
143
|
<h2 id="CHEF">CHEF</h2>
|
@@ -146,7 +146,7 @@ option.</dd>
|
|
146
146
|
|
147
147
|
|
148
148
|
<ol class='man-decor man-foot man foot'>
|
149
|
-
<li class='tl'>Chef 11.6.0.rc.
|
149
|
+
<li class='tl'>Chef 11.6.0.rc.2</li>
|
150
150
|
<li class='tc'>July 2013</li>
|
151
151
|
<li class='tr'>knife-ssh(1)</li>
|
152
152
|
</ol>
|
@@ -105,11 +105,11 @@ may not be publicly reachable.</p>
|
|
105
105
|
|
106
106
|
<h2 id="AUTHOR">AUTHOR</h2>
|
107
107
|
|
108
|
-
<p> Chef was written by Adam Jacob <a href="ma&#
|
108
|
+
<p> Chef was written by Adam Jacob <a href="mailto:adam@opscode.com" data-bare-link="true">adam@opscode.com</a> with many contributions from the community.</p>
|
109
109
|
|
110
110
|
<h2 id="DOCUMENTATION">DOCUMENTATION</h2>
|
111
111
|
|
112
|
-
<p> This manual page was written by Joshua Timberman <a href="&#
|
112
|
+
<p> This manual page was written by Joshua Timberman <a href="mailto:joshua@opscode.com" data-bare-link="true">joshua@opscode.com</a>.
|
113
113
|
Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
|
114
114
|
|
115
115
|
<h2 id="CHEF">CHEF</h2>
|
@@ -118,7 +118,7 @@ may not be publicly reachable.</p>
|
|
118
118
|
|
119
119
|
|
120
120
|
<ol class='man-decor man-foot man foot'>
|
121
|
-
<li class='tl'>Chef 11.6.0.rc.
|
121
|
+
<li class='tl'>Chef 11.6.0.rc.2</li>
|
122
122
|
<li class='tc'>July 2013</li>
|
123
123
|
<li class='tr'>knife-status(1)</li>
|
124
124
|
</ol>
|
@@ -114,11 +114,11 @@
|
|
114
114
|
|
115
115
|
<h2 id="AUTHOR">AUTHOR</h2>
|
116
116
|
|
117
|
-
<p> Chef was written by Adam Jacob <a href="ma&#
|
117
|
+
<p> Chef was written by Adam Jacob <a href="mailto:adam@opscode.com" data-bare-link="true">adam@opscode.com</a> with many contributions from the community.</p>
|
118
118
|
|
119
119
|
<h2 id="DOCUMENTATION">DOCUMENTATION</h2>
|
120
120
|
|
121
|
-
<p> This manual page was written by Daniel DeLeo <a href="&#
|
121
|
+
<p> This manual page was written by Daniel DeLeo <a href="mailto:dan@opscode.com" data-bare-link="true">dan@opscode.com</a>.
|
122
122
|
Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
|
123
123
|
|
124
124
|
<h2 id="CHEF">CHEF</h2>
|
@@ -127,7 +127,7 @@
|
|
127
127
|
|
128
128
|
|
129
129
|
<ol class='man-decor man-foot man foot'>
|
130
|
-
<li class='tl'>Chef 11.6.0.rc.
|
130
|
+
<li class='tl'>Chef 11.6.0.rc.2</li>
|
131
131
|
<li class='tc'>July 2013</li>
|
132
132
|
<li class='tr'>knife-tag(1)</li>
|
133
133
|
</ol>
|
@@ -286,12 +286,12 @@ data editing entirely.</dd>
|
|
286
286
|
|
287
287
|
<h2 id="AUTHOR">AUTHOR</h2>
|
288
288
|
|
289
|
-
<p> Chef was written by Adam Jacob <a href="m&#
|
289
|
+
<p> Chef was written by Adam Jacob <a href="mailto:adam@opscode.com" data-bare-link="true">adam@opscode.com</a> of Opscode
|
290
290
|
(<a href="http://www.opscode.com" data-bare-link="true">http://www.opscode.com</a>), with contributions from the community.</p>
|
291
291
|
|
292
292
|
<h2 id="DOCUMENTATION">DOCUMENTATION</h2>
|
293
293
|
|
294
|
-
<p> This manual page was written by Joshua Timberman <a href="ma&#
|
294
|
+
<p> This manual page was written by Joshua Timberman <a href="mailto:joshua@opscode.com" data-bare-link="true">joshua@opscode.com</a>.</p>
|
295
295
|
|
296
296
|
<h2 id="LICENSE">LICENSE</h2>
|
297
297
|
|
@@ -305,7 +305,7 @@ data editing entirely.</dd>
|
|
305
305
|
|
306
306
|
|
307
307
|
<ol class='man-decor man-foot man foot'>
|
308
|
-
<li class='tl'>Chef 11.6.0.rc.
|
308
|
+
<li class='tl'>Chef 11.6.0.rc.2</li>
|
309
309
|
<li class='tc'>July 2013</li>
|
310
310
|
<li class='tr'>knife(1)</li>
|
311
311
|
</ol>
|
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "CHEF\-SHELL" "1" "July 2013" "Chef 11.6.0.rc.
|
4
|
+
.TH "CHEF\-SHELL" "1" "July 2013" "Chef 11.6.0.rc.2" "Chef Manual"
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBchef\-shell\fR \- Interactive Chef Console
|
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "KNIFE\-BOOTSTRAP" "1" "July 2013" "Chef 11.6.0.rc.
|
4
|
+
.TH "KNIFE\-BOOTSTRAP" "1" "July 2013" "Chef 11.6.0.rc.2" "Chef Manual"
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBknife\-bootstrap\fR \- Install Chef Client on a remote host
|
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "KNIFE\-CLIENT" "1" "July 2013" "Chef 11.6.0.rc.
|
4
|
+
.TH "KNIFE\-CLIENT" "1" "July 2013" "Chef 11.6.0.rc.2" "Chef Manual"
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBknife\-client\fR \- Manage Chef API Clients
|
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "KNIFE\-CONFIGURE" "1" "July 2013" "Chef 11.6.0.rc.
|
4
|
+
.TH "KNIFE\-CONFIGURE" "1" "July 2013" "Chef 11.6.0.rc.2" "Chef Manual"
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBknife\-configure\fR \- Generate configuration files for knife or Chef Client
|
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "KNIFE\-COOKBOOK\-SITE" "1" "July 2013" "Chef 11.6.0.rc.
|
4
|
+
.TH "KNIFE\-COOKBOOK\-SITE" "1" "July 2013" "Chef 11.6.0.rc.2" "Chef Manual"
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBknife\-cookbook\-site\fR \- Install and update open source cookbooks
|
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "KNIFE\-COOKBOOK" "1" "July 2013" "Chef 11.6.0.rc.
|
4
|
+
.TH "KNIFE\-COOKBOOK" "1" "July 2013" "Chef 11.6.0.rc.2" "Chef Manual"
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBknife\-cookbook\fR \- upload and manage chef cookbooks
|
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "KNIFE\-DATA\-BAG" "1" "July 2013" "Chef 11.6.0.rc.
|
4
|
+
.TH "KNIFE\-DATA\-BAG" "1" "July 2013" "Chef 11.6.0.rc.2" "Chef Manual"
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBknife\-data\-bag\fR \- Store arbitrary data on a Chef Server
|
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "KNIFE\-ENVIRONMENT" "1" "July 2013" "Chef 11.6.0.rc.
|
4
|
+
.TH "KNIFE\-ENVIRONMENT" "1" "July 2013" "Chef 11.6.0.rc.2" "Chef Manual"
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBknife\-environment\fR \- Define cookbook policies for the environments in your infrastructure
|
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "KNIFE\-EXEC" "1" "July 2013" "Chef 11.6.0.rc.
|
4
|
+
.TH "KNIFE\-EXEC" "1" "July 2013" "Chef 11.6.0.rc.2" "Chef Manual"
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBknife\-exec\fR \- Run user scripts using the Chef API DSL
|
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "KNIFE\-INDEX" "1" "July 2013" "Chef 11.6.0.rc.
|
4
|
+
.TH "KNIFE\-INDEX" "1" "July 2013" "Chef 11.6.0.rc.2" "Chef Manual"
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBknife\-index\fR \- Rebuild the search index on a Chef Server
|
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "KNIFE\-NODE" "1" "July 2013" "Chef 11.6.0.rc.
|
4
|
+
.TH "KNIFE\-NODE" "1" "July 2013" "Chef 11.6.0.rc.2" "Chef Manual"
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBknife\-node\fR \- Manage the hosts in your infrastructure
|
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "KNIFE\-ROLE" "1" "July 2013" "Chef 11.6.0.rc.
|
4
|
+
.TH "KNIFE\-ROLE" "1" "July 2013" "Chef 11.6.0.rc.2" "Chef Manual"
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBknife\-role\fR \- Group common configuration settings
|
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "KNIFE\-SEARCH" "1" "July 2013" "Chef 11.6.0.rc.
|
4
|
+
.TH "KNIFE\-SEARCH" "1" "July 2013" "Chef 11.6.0.rc.2" "Chef Manual"
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBknife\-search\fR \- Find objects on a Chef Server by query
|
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "KNIFE\-SSH" "1" "July 2013" "Chef 11.6.0.rc.
|
4
|
+
.TH "KNIFE\-SSH" "1" "July 2013" "Chef 11.6.0.rc.2" "Chef Manual"
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBknife\-ssh\fR \- Run a command or interactive session on multiple remote hosts
|
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "KNIFE\-STATUS" "1" "July 2013" "Chef 11.6.0.rc.
|
4
|
+
.TH "KNIFE\-STATUS" "1" "July 2013" "Chef 11.6.0.rc.2" "Chef Manual"
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBknife\-status\fR \- Display status information for the nodes in your infrastructure
|
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "KNIFE\-TAG" "1" "July 2013" "Chef 11.6.0.rc.
|
4
|
+
.TH "KNIFE\-TAG" "1" "July 2013" "Chef 11.6.0.rc.2" "Chef Manual"
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBknife\-tag\fR \- Apply tags to nodes on a Chef Server
|
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "KNIFE" "1" "July 2013" "Chef 11.6.0.rc.
|
4
|
+
.TH "KNIFE" "1" "July 2013" "Chef 11.6.0.rc.2" "Chef Manual"
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBknife\fR \- Chef Server API client utility
|
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "CHEF\-CLIENT" "8" "July 2013" "Chef 11.6.0.rc.
|
4
|
+
.TH "CHEF\-CLIENT" "8" "July 2013" "Chef 11.6.0.rc.2" "Chef Manual"
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBchef\-client\fR \- Runs a client node connecting to a chef\-server\.
|
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "CHEF\-EXPANDER" "8" "July 2013" "Chef 11.6.0.rc.
|
4
|
+
.TH "CHEF\-EXPANDER" "8" "July 2013" "Chef 11.6.0.rc.2" "Chef Manual"
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBchef\-expander\fR \- fetches messages from RabbitMQ, processes, and loads into chef\-solr
|
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "CHEF\-EXPANDERCTL" "8" "July 2013" "Chef 11.6.0.rc.
|
4
|
+
.TH "CHEF\-EXPANDERCTL" "8" "July 2013" "Chef 11.6.0.rc.2" "Chef Manual"
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBchef\-expanderctl\fR \- management program for chef\-expander
|
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "CHEF\-SERVER\-WEBUI" "8" "July 2013" "Chef 11.6.0.rc.
|
4
|
+
.TH "CHEF\-SERVER\-WEBUI" "8" "July 2013" "Chef 11.6.0.rc.2" "Chef Manual"
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBchef\-server\-webui\fR \- Start the Chef Server merb application slice providing Web User Interface (Management Console)\.
|
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "CHEF\-SERVER" "8" "July 2013" "Chef 11.6.0.rc.
|
4
|
+
.TH "CHEF\-SERVER" "8" "July 2013" "Chef 11.6.0.rc.2" "Chef Manual"
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBchef\-server\fR \- Start the Chef Server merb application slice\.
|
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "CHEF\-SOLO" "8" "July 2013" "Chef 11.6.0.rc.
|
4
|
+
.TH "CHEF\-SOLO" "8" "July 2013" "Chef 11.6.0.rc.2" "Chef Manual"
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBchef\-solo\fR \- Runs chef in solo mode against a specified cookbook location\.
|
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "CHEF\-SOLR" "8" "July 2013" "Chef 11.6.0.rc.
|
4
|
+
.TH "CHEF\-SOLR" "8" "July 2013" "Chef 11.6.0.rc.2" "Chef Manual"
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBchef\-solr\fR \- Runs as Chef\'s search server
|
@@ -316,7 +316,6 @@ class Chef::Application::Client < Chef::Application
|
|
316
316
|
rescue Exception => e
|
317
317
|
if Chef::Config[:interval]
|
318
318
|
Chef::Log.error("#{e.class}: #{e}")
|
319
|
-
Chef::Application.debug_stacktrace(e)
|
320
319
|
Chef::Log.error("Sleeping for #{Chef::Config[:interval]} seconds before trying again")
|
321
320
|
unless SELF_PIPE.empty?
|
322
321
|
client_sleep Chef::Config[:interval]
|
@@ -326,7 +325,6 @@ class Chef::Application::Client < Chef::Application
|
|
326
325
|
end
|
327
326
|
retry
|
328
327
|
else
|
329
|
-
Chef::Application.debug_stacktrace(e)
|
330
328
|
Chef::Application.fatal!("#{e.class}: #{e.message}", 1)
|
331
329
|
end
|
332
330
|
end
|
data/lib/chef/client.rb
CHANGED
@@ -191,20 +191,41 @@ class Chef
|
|
191
191
|
if(Chef::Config[:client_fork] && Process.respond_to?(:fork) && !Chef::Platform.windows?)
|
192
192
|
Chef::Log.info "Forking chef instance to converge..."
|
193
193
|
pid = fork do
|
194
|
-
|
195
|
-
|
196
|
-
|
194
|
+
[:INT, :TERM].each {|s| trap(s, "EXIT") }
|
195
|
+
client_solo = Chef::Config[:solo] ? "chef-solo" : "chef-client"
|
196
|
+
$0 = "#{client_solo} worker: ppid=#{Process.ppid};start=#{Time.new.strftime("%R:%S")};"
|
197
|
+
begin
|
198
|
+
Chef::Log.debug "Forked instance now converging"
|
199
|
+
do_run
|
200
|
+
rescue Exception
|
201
|
+
exit 1
|
202
|
+
else
|
203
|
+
exit 0
|
204
|
+
end
|
197
205
|
end
|
198
|
-
Chef::Log.
|
206
|
+
Chef::Log.debug "Fork successful. Waiting for new chef pid: #{pid}"
|
199
207
|
result = Process.waitpid2(pid)
|
200
|
-
|
201
|
-
Chef::Log.
|
208
|
+
handle_child_exit(result)
|
209
|
+
Chef::Log.debug "Forked child successfully reaped (pid: #{pid})"
|
202
210
|
true
|
203
211
|
else
|
204
212
|
do_run
|
205
213
|
end
|
206
214
|
end
|
207
215
|
|
216
|
+
def handle_child_exit(pid_and_status)
|
217
|
+
status = pid_and_status[1]
|
218
|
+
return true if status.success?
|
219
|
+
message = if status.signaled?
|
220
|
+
"Chef run process terminated by signal #{status.termsig} (#{Signal.list.invert[status.termsig]})"
|
221
|
+
else
|
222
|
+
"Chef run process exited unsuccessfully (exit code #{status.exitstatus})"
|
223
|
+
end
|
224
|
+
raise Exceptions::ChildConvergeError, message
|
225
|
+
end
|
226
|
+
|
227
|
+
|
228
|
+
|
208
229
|
# Configures the Chef::Cookbook::FileVendor class to fetch file from the
|
209
230
|
# server or disk as appropriate, creates the run context for this run, and
|
210
231
|
# sanity checks the cookbook collection.
|
@@ -488,6 +509,7 @@ class Chef
|
|
488
509
|
run_status.exception = e
|
489
510
|
run_failed
|
490
511
|
end
|
512
|
+
Chef::Application.debug_stacktrace(e)
|
491
513
|
@events.run_failed(e)
|
492
514
|
raise
|
493
515
|
ensure
|
data/lib/chef/config.rb
CHANGED
data/lib/chef/exceptions.rb
CHANGED
@@ -160,6 +160,8 @@ class Chef
|
|
160
160
|
# the symlink that is there either loops or points to a nonexistent file
|
161
161
|
class InvalidSymlink < RuntimeError; end
|
162
162
|
|
163
|
+
class ChildConvergeError < RuntimeError; end
|
164
|
+
|
163
165
|
class MissingRole < RuntimeError
|
164
166
|
NULL = Object.new
|
165
167
|
|