nuri 0.5.3 → 0.5.4
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.
- checksums.yaml +4 -4
- data/README.md +5 -1
- data/VERSION +1 -1
- data/bin/nuri +60 -14
- data/bin/nuri-install-module +17 -9
- data/examples/mockcloud/apache2.sfp +14 -0
- data/examples/mockcloud/ping.rb +38 -0
- data/examples/openstack/openstack-hadoop1-cluster.sfp +37 -0
- data/examples/openstack/openstack-hadoop2-cluster.sfp +39 -0
- data/examples/v2/apache.sfp +30 -0
- data/examples/v2/aptpackage.sfp +6 -0
- data/examples/v2/mock1.sfp +12 -0
- data/examples/v2/package.sfp +22 -0
- data/examples/v2/service.sfp +94 -0
- data/examples/v2/tarpackage.sfp +5 -0
- data/lib/nuri.rb +14 -10
- data/lib/nuri/choreographer.rb +3 -3
- data/lib/nuri/helper.rb +20 -10
- data/lib/nuri/master.rb +82 -54
- data/lib/nuri/orchestrator.rb +1 -1
- data/modules/.gitignore +0 -4
- data/modules/README.md +11 -0
- data/modules/apache/apache.sfp +2 -1
- data/modules/file/file.rb +49 -19
- data/modules/hadoop1/hadoop1.rb +18 -11
- data/modules/hadoop2/hadoop2.rb +11 -11
- data/modules/hadoop2/hadoop2.sfp +7 -6
- data/modules/hadoop2/yarn-site.xml +5 -0
- data/modules/machine/machine.rb +24 -14
- data/modules/openstack/README.md +24 -0
- data/modules/openstack/config.yml +5 -0
- data/modules/openstack/example.sfp +9 -0
- data/modules/openstack/openstack.rb +329 -0
- data/modules/openstack/openstack.sfp +24 -0
- data/modules/os/os.rb +1 -1
- data/modules/package2/apt-repo-list.sh +15 -0
- data/modules/package2/package2.rb +213 -43
- data/modules/package2/package2.sfp +3 -2
- data/modules/pyfile/README.md +4 -0
- data/modules/vm/vm.rb +3 -1
- data/modules/vm/vm.sfp +4 -3
- metadata +20 -3
- data/modules/hpcloud/test.sfp +0 -5
data/modules/vm/vm.rb
CHANGED
@@ -1,8 +1,10 @@
|
|
1
1
|
require File.expand_path(File.dirname(__FILE__)) + "/../machine/machine.rb"
|
2
2
|
|
3
3
|
class Sfp::Module::VM < Sfp::Module::Machine
|
4
|
+
InCloud = "#{Sfp::Agent::Home}/vm.in_cloud"
|
5
|
+
|
4
6
|
def update_state
|
5
7
|
self.class.superclass.instance_method(:update_state).bind(self).call
|
6
|
-
@state['in_cloud'] =
|
8
|
+
@state['in_cloud'] = (File.exist?(InCloud) ? File.read(InCloud).strip : '')
|
7
9
|
end
|
8
10
|
end
|
data/modules/vm/vm.sfp
CHANGED
@@ -7,12 +7,13 @@ schema VM extends Machine {
|
|
7
7
|
|
8
8
|
final cpus = 1
|
9
9
|
final memory = 512
|
10
|
-
final
|
11
|
-
final
|
10
|
+
final networks { }
|
11
|
+
final disks { }
|
12
12
|
|
13
|
-
final username = ""
|
14
13
|
final flavor = ""
|
15
14
|
final image = ""
|
16
15
|
final security_group = ""
|
16
|
+
|
17
|
+
final ssh_user = ""
|
17
18
|
final ssh_key_name = ""
|
18
19
|
}
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: nuri
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.5.
|
4
|
+
version: 0.5.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Herry
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2013-
|
11
|
+
date: 2013-12-15 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: sfplanner
|
@@ -158,12 +158,22 @@ files:
|
|
158
158
|
- examples/hadoop1.sfp
|
159
159
|
- examples/hadoop2.sfp
|
160
160
|
- examples/hpcloud.sfp
|
161
|
+
- examples/mockcloud/apache2.sfp
|
161
162
|
- examples/mockcloud/generator.rb
|
162
163
|
- examples/mockcloud/generator.rb.bak
|
163
164
|
- examples/mockcloud/hadoop2.sfp.template
|
165
|
+
- examples/mockcloud/ping.rb
|
164
166
|
- examples/mockcloud/run.rb
|
167
|
+
- examples/openstack/openstack-hadoop1-cluster.sfp
|
168
|
+
- examples/openstack/openstack-hadoop2-cluster.sfp
|
165
169
|
- examples/test.inc
|
166
170
|
- examples/test.sfp
|
171
|
+
- examples/v2/apache.sfp
|
172
|
+
- examples/v2/aptpackage.sfp
|
173
|
+
- examples/v2/mock1.sfp
|
174
|
+
- examples/v2/package.sfp
|
175
|
+
- examples/v2/service.sfp
|
176
|
+
- examples/v2/tarpackage.sfp
|
167
177
|
- examples/wordpress.sfp
|
168
178
|
- lib/naas/d3.js
|
169
179
|
- lib/naas/d3.v3.min.js
|
@@ -183,6 +193,7 @@ files:
|
|
183
193
|
- lib/nuri/server.rb
|
184
194
|
- lib/nuri/targz.rb
|
185
195
|
- modules/.gitignore
|
196
|
+
- modules/README.md
|
186
197
|
- modules/apache/apache.rb
|
187
198
|
- modules/apache/apache.rb.old
|
188
199
|
- modules/apache/apache.sfp
|
@@ -229,7 +240,6 @@ files:
|
|
229
240
|
- modules/hpcloud/example.sfp
|
230
241
|
- modules/hpcloud/hpcloud.rb
|
231
242
|
- modules/hpcloud/hpcloud.sfp
|
232
|
-
- modules/hpcloud/test.sfp
|
233
243
|
- modules/machine/machine.rb
|
234
244
|
- modules/machine/machine.sfp
|
235
245
|
- modules/mockcloud/mockcloud.rb
|
@@ -241,13 +251,20 @@ files:
|
|
241
251
|
- modules/node/node.sfp
|
242
252
|
- modules/object/object.rb
|
243
253
|
- modules/object/object.sfp
|
254
|
+
- modules/openstack/README.md
|
255
|
+
- modules/openstack/config.yml
|
256
|
+
- modules/openstack/example.sfp
|
257
|
+
- modules/openstack/openstack.rb
|
258
|
+
- modules/openstack/openstack.sfp
|
244
259
|
- modules/os/os.rb
|
245
260
|
- modules/os/os.sfp
|
246
261
|
- modules/package/package.rb
|
247
262
|
- modules/package/package.sfp
|
248
263
|
- modules/package/test.sfp
|
264
|
+
- modules/package2/apt-repo-list.sh
|
249
265
|
- modules/package2/package2.rb
|
250
266
|
- modules/package2/package2.sfp
|
267
|
+
- modules/pyfile/README.md
|
251
268
|
- modules/pyfile/main
|
252
269
|
- modules/pyfile/pyfile.sfp
|
253
270
|
- modules/service/service.rb
|