chef 0.10.0.qs.1 → 0.10.0.rc.0
Sign up to get free protection for your applications and to get access to all the features.
- data/distro/common/html/chef-client.8.html +1 -1
- data/distro/common/html/{chef-expander.8.html → chef-expander-cluster.8.html} +11 -11
- data/distro/common/html/chef-expanderctl.8.html +1 -1
- data/distro/common/html/chef-server-webui.8.html +1 -1
- data/distro/common/html/chef-server.8.html +1 -1
- data/distro/common/html/chef-solo.8.html +1 -1
- data/distro/common/html/chef-solr.8.html +1 -1
- data/distro/common/html/knife-bootstrap.1.html +1 -1
- data/distro/common/html/knife-client.1.html +1 -1
- data/distro/common/html/knife-configure.1.html +1 -1
- data/distro/common/html/knife-cookbook-site.1.html +1 -1
- data/distro/common/html/knife-cookbook.1.html +1 -1
- data/distro/common/html/knife-data-bag.1.html +1 -1
- data/distro/common/html/knife-environment.1.html +1 -1
- data/distro/common/html/knife-exec.1.html +1 -1
- data/distro/common/html/knife-index.1.html +1 -1
- data/distro/common/html/knife-node.1.html +1 -1
- data/distro/common/html/knife-recipe.1.html +1 -1
- data/distro/common/html/knife-role.1.html +1 -1
- data/distro/common/html/knife-search.1.html +1 -1
- data/distro/common/html/knife-ssh.1.html +1 -1
- data/distro/common/html/knife-status.1.html +1 -1
- data/distro/common/html/knife-tag.1.html +1 -1
- data/distro/common/html/knife.1.html +1 -1
- data/distro/common/html/shef.1.html +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/man1/shef.1 +1 -1
- data/distro/common/man/man8/chef-client.8 +1 -1
- data/distro/common/man/man8/{chef-expander.8 → chef-expander-cluster.8} +5 -5
- 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/distro/common/markdown/man8/{chef-expander.mkd → chef-expander-cluster.mkd} +4 -4
- data/distro/redhat/etc/init.d/chef-expander +1 -1
- data/distro/redhat/etc/init.d/chef-solr +1 -1
- data/lib/chef.rb +0 -1
- data/lib/chef/api_client.rb +0 -6
- data/lib/chef/application.rb +6 -5
- data/lib/chef/application/client.rb +0 -5
- data/lib/chef/cookbook_uploader.rb +1 -4
- data/lib/chef/cookbook_version.rb +15 -12
- data/lib/chef/data_bag_item.rb +3 -3
- data/lib/chef/handler/error_report.rb +9 -2
- data/lib/chef/knife.rb +0 -1
- data/lib/chef/knife/bootstrap.rb +35 -5
- data/lib/chef/knife/bootstrap/archlinux-gems.erb +1 -1
- data/lib/chef/knife/bootstrap/centos5-gems.erb +14 -6
- data/lib/chef/knife/bootstrap/fedora13-gems.erb +12 -4
- data/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb +15 -4
- data/lib/chef/knife/cookbook_list.rb +1 -0
- data/lib/chef/knife/data_bag_create.rb +12 -14
- data/lib/chef/knife/data_bag_edit.rb +2 -2
- data/lib/chef/knife/data_bag_from_file.rb +2 -2
- data/lib/chef/knife/data_bag_show.rb +2 -2
- data/lib/chef/knife/search.rb +0 -3
- data/lib/chef/knife/ssh.rb +0 -2
- data/lib/chef/mixin/language.rb +0 -1
- data/lib/chef/provider/deploy.rb +1 -1
- data/lib/chef/provider/git.rb +3 -26
- data/lib/chef/provider/subversion.rb +1 -1
- data/lib/chef/recipe.rb +0 -1
- data/lib/chef/resource.rb +8 -9
- data/lib/chef/rest.rb +6 -10
- data/lib/chef/shell_out.rb +1 -1
- data/lib/chef/solr_query.rb +1 -1
- data/lib/chef/version.rb +1 -1
- metadata +5 -98
- data/lib/chef/knife/core/bootstrap_context.rb +0 -81
@@ -1,81 +0,0 @@
|
|
1
|
-
#
|
2
|
-
# Author:: Daniel DeLeo (<dan@opscode.com>)
|
3
|
-
# Copyright:: Copyright (c) 2011 Opscode, Inc.
|
4
|
-
# License:: Apache License, Version 2.0
|
5
|
-
#
|
6
|
-
# Licensed under the Apache License, Version 2.0 (the "License");
|
7
|
-
# you may not use this file except in compliance with the License.
|
8
|
-
# You may obtain a copy of the License at
|
9
|
-
#
|
10
|
-
# http://www.apache.org/licenses/LICENSE-2.0
|
11
|
-
#
|
12
|
-
# Unless required by applicable law or agreed to in writing, software
|
13
|
-
# distributed under the License is distributed on an "AS IS" BASIS,
|
14
|
-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
15
|
-
# See the License for the specific language governing permissions and
|
16
|
-
# limitations under the License.
|
17
|
-
#
|
18
|
-
|
19
|
-
require 'chef/run_list'
|
20
|
-
class Chef
|
21
|
-
class Knife
|
22
|
-
module Core
|
23
|
-
# Instances of BootstrapContext are the context objects (i.e., +self+) for
|
24
|
-
# bootstrap templates. For backwards compatability, they +must+ set the
|
25
|
-
# following instance variables:
|
26
|
-
# * @config - a hash of knife's config values
|
27
|
-
# * @run_list - the run list for the node to boostrap
|
28
|
-
#
|
29
|
-
class BootstrapContext
|
30
|
-
|
31
|
-
def initialize(config, run_list, chef_config)
|
32
|
-
@config = config
|
33
|
-
@run_list = run_list
|
34
|
-
@chef_config = chef_config
|
35
|
-
end
|
36
|
-
|
37
|
-
def bootstrap_version_string
|
38
|
-
if @config[:prerelease]
|
39
|
-
"--prerelease"
|
40
|
-
else
|
41
|
-
version = knife_config[:bootstrap_version] || Chef::VERSION
|
42
|
-
"--version #{version}"
|
43
|
-
end
|
44
|
-
end
|
45
|
-
|
46
|
-
def bootstrap_environment
|
47
|
-
@chef_config[:environment] || '_default'
|
48
|
-
end
|
49
|
-
|
50
|
-
def validation_key
|
51
|
-
IO.read(@chef_config[:validation_key])
|
52
|
-
end
|
53
|
-
|
54
|
-
def config_content
|
55
|
-
client_rb = <<-CONFIG
|
56
|
-
log_level :info
|
57
|
-
log_location STDOUT
|
58
|
-
chef_server_url "#{@chef_config[:chef_server_url]}"
|
59
|
-
validation_client_name "#{@chef_config[:validation_client_name]}"
|
60
|
-
CONFIG
|
61
|
-
if @config[:chef_node_name]
|
62
|
-
client_rb << %Q{node_name "#{@config[:chef_node_name]}"\n}
|
63
|
-
else
|
64
|
-
client_rb << "# Using default node name (fqdn)\n"
|
65
|
-
end
|
66
|
-
client_rb
|
67
|
-
end
|
68
|
-
|
69
|
-
def start_chef
|
70
|
-
"/usr/bin/chef-client -j /etc/chef/first-boot.json -E #{bootstrap_environment}"
|
71
|
-
end
|
72
|
-
|
73
|
-
def knife_config
|
74
|
-
@chef_config.key?(:knife) ? @chef_config[:knife] : {}
|
75
|
-
end
|
76
|
-
|
77
|
-
end
|
78
|
-
end
|
79
|
-
end
|
80
|
-
end
|
81
|
-
|