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.
Files changed (43) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +5 -1
  3. data/VERSION +1 -1
  4. data/bin/nuri +60 -14
  5. data/bin/nuri-install-module +17 -9
  6. data/examples/mockcloud/apache2.sfp +14 -0
  7. data/examples/mockcloud/ping.rb +38 -0
  8. data/examples/openstack/openstack-hadoop1-cluster.sfp +37 -0
  9. data/examples/openstack/openstack-hadoop2-cluster.sfp +39 -0
  10. data/examples/v2/apache.sfp +30 -0
  11. data/examples/v2/aptpackage.sfp +6 -0
  12. data/examples/v2/mock1.sfp +12 -0
  13. data/examples/v2/package.sfp +22 -0
  14. data/examples/v2/service.sfp +94 -0
  15. data/examples/v2/tarpackage.sfp +5 -0
  16. data/lib/nuri.rb +14 -10
  17. data/lib/nuri/choreographer.rb +3 -3
  18. data/lib/nuri/helper.rb +20 -10
  19. data/lib/nuri/master.rb +82 -54
  20. data/lib/nuri/orchestrator.rb +1 -1
  21. data/modules/.gitignore +0 -4
  22. data/modules/README.md +11 -0
  23. data/modules/apache/apache.sfp +2 -1
  24. data/modules/file/file.rb +49 -19
  25. data/modules/hadoop1/hadoop1.rb +18 -11
  26. data/modules/hadoop2/hadoop2.rb +11 -11
  27. data/modules/hadoop2/hadoop2.sfp +7 -6
  28. data/modules/hadoop2/yarn-site.xml +5 -0
  29. data/modules/machine/machine.rb +24 -14
  30. data/modules/openstack/README.md +24 -0
  31. data/modules/openstack/config.yml +5 -0
  32. data/modules/openstack/example.sfp +9 -0
  33. data/modules/openstack/openstack.rb +329 -0
  34. data/modules/openstack/openstack.sfp +24 -0
  35. data/modules/os/os.rb +1 -1
  36. data/modules/package2/apt-repo-list.sh +15 -0
  37. data/modules/package2/package2.rb +213 -43
  38. data/modules/package2/package2.sfp +3 -2
  39. data/modules/pyfile/README.md +4 -0
  40. data/modules/vm/vm.rb +3 -1
  41. data/modules/vm/vm.sfp +4 -3
  42. metadata +20 -3
  43. data/modules/hpcloud/test.sfp +0 -5
@@ -2,9 +2,10 @@ schema Package2 {
2
2
  installed : Bool
3
3
 
4
4
  final name = ""
5
- final version = "latest"
6
- final source = "default"
7
5
  final provider = "apt"
6
+ final version = "latest"
7
+ final source = ""
8
+ final home = ""
8
9
 
9
10
  synchronized sub install {
10
11
  effect {
@@ -0,0 +1,4 @@
1
+ pyfile module
2
+ =============
3
+
4
+ This is an example module written in a non-Ruby programming language (Python).
@@ -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'] = @model['in_cloud']
8
+ @state['in_cloud'] = (File.exist?(InCloud) ? File.read(InCloud).strip : '')
7
9
  end
8
10
  end
@@ -7,12 +7,13 @@ schema VM extends Machine {
7
7
 
8
8
  final cpus = 1
9
9
  final memory = 512
10
- final network { }
11
- final disk { }
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.3
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-10 00:00:00.000000000 Z
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
@@ -1,5 +0,0 @@
1
- include "hpcloud.sfp"
2
-
3
- a isa HPCloud {
4
-
5
- }