knife-solo 0.0.4 → 0.0.5
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/chef/knife/prepare.rb +15 -7
- data/lib/knife-solo/info.rb +1 -1
- data/lib/knife-solo/ssh_command.rb +1 -0
- metadata +12 -12
data/lib/chef/knife/prepare.rb
CHANGED
@@ -30,12 +30,18 @@ class Chef
|
|
30
30
|
@packages.join(' ')
|
31
31
|
end
|
32
32
|
|
33
|
+
def zypper_gem_install
|
34
|
+
ui.msg("Installing required packages...")
|
35
|
+
run_command("sudo zypper --non-interactive install ruby-devel make gcc rsync")
|
36
|
+
gem_install
|
37
|
+
end
|
38
|
+
|
33
39
|
def emerge_gem_install
|
34
40
|
ui.msg("Installing required packages...")
|
35
41
|
run_command("sudo USE='-test' ACCEPT_KEYWORDS='~amd64' emerge -u chef")
|
36
42
|
end
|
37
43
|
|
38
|
-
def
|
44
|
+
def add_yum_repos
|
39
45
|
ui.message("Adding EPEL and ELFF...")
|
40
46
|
repo_url = "http://download.fedora.redhat.com"
|
41
47
|
repo_path = "/pub/epel/5/i386/epel-release-5-4.noarch.rpm"
|
@@ -50,7 +56,7 @@ class Chef
|
|
50
56
|
raise result.stderr unless result.success? || result.stdout.match(installed)
|
51
57
|
end
|
52
58
|
|
53
|
-
def
|
59
|
+
def yum_gem_install
|
54
60
|
ui.msg("Installing required packages...")
|
55
61
|
@packages = %w(ruby ruby-shadow gcc gcc-c++ ruby-devel wget rsync)
|
56
62
|
run_command("sudo yum -y install #{package_list}")
|
@@ -73,7 +79,7 @@ class Chef
|
|
73
79
|
|
74
80
|
def gem_install
|
75
81
|
ui.msg "Installing rubygems from source..."
|
76
|
-
release = "rubygems-1.
|
82
|
+
release = "rubygems-1.8.10"
|
77
83
|
file = "#{release}.tgz"
|
78
84
|
url = "http://production.cf.rubygems.org/rubygems/#{file}"
|
79
85
|
run_command("wget #{url}")
|
@@ -99,15 +105,17 @@ class Chef
|
|
99
105
|
version = run_command("lsb_release -cs").stdout.strip
|
100
106
|
{:type => "debian", :version => version}
|
101
107
|
when %r{CentOS}
|
102
|
-
{:type => "
|
108
|
+
{:type => "yum", :version => "CentOS"}
|
103
109
|
when %r{Red Hat Enterprise Linux}
|
104
|
-
{:type => "
|
110
|
+
{:type => "yum", :version => "Red Hat"}
|
105
111
|
when %r{Scientific Linux SL}
|
106
|
-
{:type => "
|
112
|
+
{:type => "yum", :version => "Scientific Linux"}
|
113
|
+
when %r{openSUSE 11.4}
|
114
|
+
{:type => "zypper", :version => "openSUSE"}
|
107
115
|
when %r{This is \\n\.\\O (\\s \\m \\r) \\t}
|
108
116
|
{:type => "gentoo", :version => "Gentoo"}
|
109
117
|
else
|
110
|
-
raise "
|
118
|
+
raise "Distro not recognized from looking at /etc/issue. Please fork https://github.com/matschaffer/knife-solo and add support for your distro."
|
111
119
|
end
|
112
120
|
end
|
113
121
|
end
|
data/lib/knife-solo/info.rb
CHANGED
@@ -75,6 +75,7 @@ module KnifeSolo
|
|
75
75
|
options = config_file_options
|
76
76
|
options[:port] = config[:ssh_port] if config[:ssh_port]
|
77
77
|
options[:password] = config[:ssh_password] if config[:ssh_password]
|
78
|
+
options[:keys] = [config[:ssh_identity]] if config[:ssh_identity]
|
78
79
|
options
|
79
80
|
end
|
80
81
|
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: knife-solo
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.5
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,11 +9,11 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2011-10-
|
12
|
+
date: 2011-10-31 00:00:00.000000000Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: rake
|
16
|
-
requirement: &
|
16
|
+
requirement: &70331323547300 !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ! '>='
|
@@ -21,10 +21,10 @@ dependencies:
|
|
21
21
|
version: '0'
|
22
22
|
type: :development
|
23
23
|
prerelease: false
|
24
|
-
version_requirements: *
|
24
|
+
version_requirements: *70331323547300
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: mocha
|
27
|
-
requirement: &
|
27
|
+
requirement: &70331323543340 !ruby/object:Gem::Requirement
|
28
28
|
none: false
|
29
29
|
requirements:
|
30
30
|
- - ! '>='
|
@@ -32,10 +32,10 @@ dependencies:
|
|
32
32
|
version: '0'
|
33
33
|
type: :development
|
34
34
|
prerelease: false
|
35
|
-
version_requirements: *
|
35
|
+
version_requirements: *70331323543340
|
36
36
|
- !ruby/object:Gem::Dependency
|
37
37
|
name: virtualbox
|
38
|
-
requirement: &
|
38
|
+
requirement: &70331323532360 !ruby/object:Gem::Requirement
|
39
39
|
none: false
|
40
40
|
requirements:
|
41
41
|
- - ! '>='
|
@@ -43,10 +43,10 @@ dependencies:
|
|
43
43
|
version: '0'
|
44
44
|
type: :development
|
45
45
|
prerelease: false
|
46
|
-
version_requirements: *
|
46
|
+
version_requirements: *70331323532360
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: chef
|
49
|
-
requirement: &
|
49
|
+
requirement: &70331323530880 !ruby/object:Gem::Requirement
|
50
50
|
none: false
|
51
51
|
requirements:
|
52
52
|
- - ~>
|
@@ -54,10 +54,10 @@ dependencies:
|
|
54
54
|
version: 0.10.0
|
55
55
|
type: :runtime
|
56
56
|
prerelease: false
|
57
|
-
version_requirements: *
|
57
|
+
version_requirements: *70331323530880
|
58
58
|
- !ruby/object:Gem::Dependency
|
59
59
|
name: net-ssh
|
60
|
-
requirement: &
|
60
|
+
requirement: &70331323528620 !ruby/object:Gem::Requirement
|
61
61
|
none: false
|
62
62
|
requirements:
|
63
63
|
- - ~>
|
@@ -65,7 +65,7 @@ dependencies:
|
|
65
65
|
version: 2.1.3
|
66
66
|
type: :runtime
|
67
67
|
prerelease: false
|
68
|
-
version_requirements: *
|
68
|
+
version_requirements: *70331323528620
|
69
69
|
description: Handles bootstrapping, running chef solo, rsyncing cookbooks etc
|
70
70
|
email: mat@schaffer.me
|
71
71
|
executables: []
|