chef 0.9.4 → 0.9.6
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/chef/application/solo.rb +2 -1
- data/lib/chef/knife/cookbook_upload.rb +1 -1
- data/lib/chef/provider/group/dscl.rb +0 -1
- data/lib/chef/shef/ext.rb +4 -0
- data/lib/chef/version.rb +1 -1
- metadata +3 -3
@@ -15,6 +15,7 @@
|
|
15
15
|
# See the License for the specific language governing permissions and
|
16
16
|
# limitations under the License.
|
17
17
|
|
18
|
+
require 'chef'
|
18
19
|
require 'chef/application'
|
19
20
|
require 'chef/client'
|
20
21
|
require 'chef/config'
|
@@ -118,7 +119,7 @@ class Chef::Application::Solo < Chef::Application
|
|
118
119
|
def reconfigure
|
119
120
|
super
|
120
121
|
|
121
|
-
Chef::Config
|
122
|
+
Chef::Config[:solo] = true
|
122
123
|
|
123
124
|
if Chef::Config[:daemonize]
|
124
125
|
Chef::Config[:interval] ||= 1800
|
@@ -144,7 +144,7 @@ class Chef
|
|
144
144
|
begin
|
145
145
|
catch_auth_exceptions{ rest.put_rest(sandbox_url, {:is_completed => true}) }
|
146
146
|
rescue Net::HTTPServerException => e
|
147
|
-
if e.message =~ /^400/ && (retries += 1) <=
|
147
|
+
if e.message =~ /^400/ && (retries += 1) <= 5
|
148
148
|
sleep 2
|
149
149
|
retry
|
150
150
|
else
|
@@ -73,7 +73,6 @@ class Chef
|
|
73
73
|
end
|
74
74
|
|
75
75
|
def set_members
|
76
|
-
pp :set_members => {:append => @new_resource.append, :members => @new_resource.members}
|
77
76
|
unless @new_resource.append
|
78
77
|
Chef::Log.debug("#{@new_resource}: removing group members #{@current_resource.members.join(' ')}") unless @current_resource.members.empty?
|
79
78
|
safe_dscl("create /Groups/#{@new_resource.group_name} GroupMembers ''") # clear guid list
|
data/lib/chef/shef/ext.rb
CHANGED
@@ -14,6 +14,10 @@
|
|
14
14
|
# See the License for the specific language governing permissions and
|
15
15
|
# limitations under the License.
|
16
16
|
#
|
17
|
+
require 'chef/recipe'
|
18
|
+
require 'fileutils'
|
19
|
+
require 'chef/version'
|
20
|
+
require 'chef/shef/shef_session'
|
17
21
|
|
18
22
|
module Shef
|
19
23
|
module Extensions
|
data/lib/chef/version.rb
CHANGED
metadata
CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
|
|
5
5
|
segments:
|
6
6
|
- 0
|
7
7
|
- 9
|
8
|
-
-
|
9
|
-
version: 0.9.
|
8
|
+
- 6
|
9
|
+
version: 0.9.6
|
10
10
|
platform: ruby
|
11
11
|
authors:
|
12
12
|
- Adam Jacob
|
@@ -14,7 +14,7 @@ autorequire:
|
|
14
14
|
bindir: bin
|
15
15
|
cert_chain: []
|
16
16
|
|
17
|
-
date: 2010-
|
17
|
+
date: 2010-07-02 00:00:00 -07:00
|
18
18
|
default_executable:
|
19
19
|
dependencies:
|
20
20
|
- !ruby/object:Gem::Dependency
|