marionette 0.0.11 → 0.0.12
Sign up to get free protection for your applications and to get access to all the features.
- data/README.md +2 -1
- data/lib/marionette/puppet.rb +7 -7
- data/lib/marionette/version.rb +1 -1
- data/marionette.gemspec +1 -1
- metadata +16 -6
data/README.md
CHANGED
@@ -5,7 +5,8 @@ Marionette connects a headstartapp server instance (puppet node) to its
|
|
5
5
|
master and executes puppet runs on demand. Marionette uses fast and lightweight
|
6
6
|
0MQ <http://zeromq.org> messaging system.
|
7
7
|
|
8
|
-
* From version 0.0.
|
8
|
+
* From version 0.0.12 onward, Puppet.message returns an array and includes system command results.
|
9
|
+
* From version 0.0.9 onward, Marionette.setup automatically ran at connect.
|
9
10
|
* From version 0.0.8 onward, use puppet agent for puppet runs
|
10
11
|
* From version 0.0.7 onward, talk replaces send and receive.
|
11
12
|
* From version 0.0.7 onward, marionette reconnects after n-poll attempts (10 by default).
|
data/lib/marionette/puppet.rb
CHANGED
@@ -2,7 +2,6 @@ module HeadStartApp
|
|
2
2
|
module Marionette
|
3
3
|
|
4
4
|
require 'uri'
|
5
|
-
require 'facter'
|
6
5
|
|
7
6
|
|
8
7
|
# Puppet class is the active ZMQ connection on the puppet node
|
@@ -12,6 +11,7 @@ module HeadStartApp
|
|
12
11
|
def initialize(socket)
|
13
12
|
|
14
13
|
@socket = socket
|
14
|
+
@messages = []
|
15
15
|
start
|
16
16
|
|
17
17
|
end
|
@@ -33,7 +33,7 @@ module HeadStartApp
|
|
33
33
|
@response = @socket.recv
|
34
34
|
|
35
35
|
# Sets default message to current time
|
36
|
-
@message
|
36
|
+
@message << "Response from node @ #{Time.now}."
|
37
37
|
|
38
38
|
begin
|
39
39
|
|
@@ -52,7 +52,7 @@ module HeadStartApp
|
|
52
52
|
|
53
53
|
# Send back system stats
|
54
54
|
# @socket.send Marshal.dump(stats)
|
55
|
-
@socket.send Marshal.dump(@
|
55
|
+
@socket.send Marshal.dump(@messages)
|
56
56
|
|
57
57
|
end
|
58
58
|
|
@@ -76,7 +76,7 @@ module HeadStartApp
|
|
76
76
|
# Executes ad hoc system command msg'd from the master
|
77
77
|
def system_run
|
78
78
|
|
79
|
-
|
79
|
+
@message << `#{@response[:system][:command]}`
|
80
80
|
|
81
81
|
end
|
82
82
|
|
@@ -84,9 +84,9 @@ module HeadStartApp
|
|
84
84
|
def puppet_run
|
85
85
|
|
86
86
|
if @response[:puppet].nil?
|
87
|
-
|
87
|
+
@message << `puppet agent --server master.runrails.com --verbose --waitforcert 5 --no-daemonize --onetime --logdest /var/log/puppet.log`
|
88
88
|
else
|
89
|
-
|
89
|
+
@message << `puppet agent #{@response[:puppet][:args]}`
|
90
90
|
end
|
91
91
|
|
92
92
|
end
|
@@ -98,7 +98,7 @@ module HeadStartApp
|
|
98
98
|
facts = `facter`
|
99
99
|
facts = facts.split "\n"
|
100
100
|
facts.collect! {|f| ff=f.split("=>"); {ff[0].strip.to_sym => ff[1]}}.compact
|
101
|
-
@message
|
101
|
+
@message << facts
|
102
102
|
|
103
103
|
end
|
104
104
|
|
data/lib/marionette/version.rb
CHANGED
data/marionette.gemspec
CHANGED
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
|
|
10
10
|
s.email = ["dan@headstartapp.com"]
|
11
11
|
s.homepage = "https://github.com/headstartapp/marionette"
|
12
12
|
s.summary = %q{0MQ connection between puppet and master.}
|
13
|
-
s.description = %q{Marionette connects a
|
13
|
+
s.description = %q{Marionette connects a puppet node to its master and executes puppet runs on demand. Marionette uses fast and lightweight 0MQ <http://zeromq.org> messaging system.}
|
14
14
|
|
15
15
|
s.rubyforge_project = "marionette"
|
16
16
|
|
metadata
CHANGED
@@ -1,12 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: marionette
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
|
4
|
+
hash: 7
|
5
|
+
prerelease:
|
5
6
|
segments:
|
6
7
|
- 0
|
7
8
|
- 0
|
8
|
-
-
|
9
|
-
version: 0.0.
|
9
|
+
- 12
|
10
|
+
version: 0.0.12
|
10
11
|
platform: ruby
|
11
12
|
authors:
|
12
13
|
- Dan Lee
|
@@ -14,7 +15,7 @@ autorequire:
|
|
14
15
|
bindir: bin
|
15
16
|
cert_chain: []
|
16
17
|
|
17
|
-
date: 2011-01-
|
18
|
+
date: 2011-01-19 00:00:00 -08:00
|
18
19
|
default_executable:
|
19
20
|
dependencies:
|
20
21
|
- !ruby/object:Gem::Dependency
|
@@ -25,6 +26,7 @@ dependencies:
|
|
25
26
|
requirements:
|
26
27
|
- - ">="
|
27
28
|
- !ruby/object:Gem::Version
|
29
|
+
hash: 3
|
28
30
|
segments:
|
29
31
|
- 0
|
30
32
|
version: "0"
|
@@ -38,6 +40,7 @@ dependencies:
|
|
38
40
|
requirements:
|
39
41
|
- - ">="
|
40
42
|
- !ruby/object:Gem::Version
|
43
|
+
hash: 3
|
41
44
|
segments:
|
42
45
|
- 0
|
43
46
|
version: "0"
|
@@ -51,6 +54,7 @@ dependencies:
|
|
51
54
|
requirements:
|
52
55
|
- - ">="
|
53
56
|
- !ruby/object:Gem::Version
|
57
|
+
hash: 3
|
54
58
|
segments:
|
55
59
|
- 0
|
56
60
|
version: "0"
|
@@ -64,6 +68,7 @@ dependencies:
|
|
64
68
|
requirements:
|
65
69
|
- - ">="
|
66
70
|
- !ruby/object:Gem::Version
|
71
|
+
hash: 3
|
67
72
|
segments:
|
68
73
|
- 0
|
69
74
|
version: "0"
|
@@ -77,6 +82,7 @@ dependencies:
|
|
77
82
|
requirements:
|
78
83
|
- - ">="
|
79
84
|
- !ruby/object:Gem::Version
|
85
|
+
hash: 3
|
80
86
|
segments:
|
81
87
|
- 0
|
82
88
|
version: "0"
|
@@ -90,6 +96,7 @@ dependencies:
|
|
90
96
|
requirements:
|
91
97
|
- - ">="
|
92
98
|
- !ruby/object:Gem::Version
|
99
|
+
hash: 3
|
93
100
|
segments:
|
94
101
|
- 0
|
95
102
|
version: "0"
|
@@ -103,12 +110,13 @@ dependencies:
|
|
103
110
|
requirements:
|
104
111
|
- - ">="
|
105
112
|
- !ruby/object:Gem::Version
|
113
|
+
hash: 3
|
106
114
|
segments:
|
107
115
|
- 0
|
108
116
|
version: "0"
|
109
117
|
type: :runtime
|
110
118
|
version_requirements: *id007
|
111
|
-
description: Marionette connects a
|
119
|
+
description: Marionette connects a puppet node to its master and executes puppet runs on demand. Marionette uses fast and lightweight 0MQ <http://zeromq.org> messaging system.
|
112
120
|
email:
|
113
121
|
- dan@headstartapp.com
|
114
122
|
executables:
|
@@ -149,6 +157,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
149
157
|
requirements:
|
150
158
|
- - ">="
|
151
159
|
- !ruby/object:Gem::Version
|
160
|
+
hash: 3
|
152
161
|
segments:
|
153
162
|
- 0
|
154
163
|
version: "0"
|
@@ -157,13 +166,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
157
166
|
requirements:
|
158
167
|
- - ">="
|
159
168
|
- !ruby/object:Gem::Version
|
169
|
+
hash: 3
|
160
170
|
segments:
|
161
171
|
- 0
|
162
172
|
version: "0"
|
163
173
|
requirements: []
|
164
174
|
|
165
175
|
rubyforge_project: marionette
|
166
|
-
rubygems_version: 1.
|
176
|
+
rubygems_version: 1.4.2
|
167
177
|
signing_key:
|
168
178
|
specification_version: 3
|
169
179
|
summary: 0MQ connection between puppet and master.
|