ironfan 3.1.6 → 3.1.7

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.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 3.1.6
1
+ 3.1.7
data/ironfan.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "ironfan"
8
- s.version = "3.1.6"
8
+ s.version = "3.1.7"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Infochimps"]
12
- s.date = "2012-06-24"
12
+ s.date = "2012-07-24"
13
13
  s.description = "Ironfan allows you to orchestrate not just systems but clusters of machines. It includes a powerful layer on top of knife and a collection of cloud cookbooks."
14
14
  s.email = "coders@infochimps.com"
15
15
  s.extra_rdoc_files = [
@@ -48,8 +48,9 @@ class Chef
48
48
  if config[:verbosity] >= 2
49
49
  target.each do |svr|
50
50
  Chef::Log.debug( "Server #{svr.name}: #{JSON.pretty_generate(svr.to_hash)}" )
51
- Chef::Log.debug( "- cloud: #{JSON.pretty_generate(svr.cloud.to_hash)}" )
52
- Chef::Log.debug( "- fog: #{JSON.pretty_generate(svr.fog_launch_description)}" )
51
+ Chef::Log.debug( "- volumes: #{JSON.pretty_generate(svr.composite_volumes.values.map(&:to_hash))}" )
52
+ Chef::Log.debug( "- cloud: #{JSON.pretty_generate(svr.cloud.to_hash)}" )
53
+ Chef::Log.debug( "- fog: #{JSON.pretty_generate(svr.fog_launch_description)}" )
53
54
  end
54
55
  end
55
56
 
@@ -32,16 +32,16 @@ Vagrant::Config.run do |config|
32
32
  # learn more abt vagrant to figure out where.
33
33
  #
34
34
 
35
- # TODO: FIXME: WTF is this hoary horseshit? At *least* do it by cluster-facet,
35
+ # TODO: FIXME: WTF is this hoary horseshit? At *least* do it by cluster-facet,
36
36
  # not just facet (especially since the examples given are all *clusters*)
37
37
  def ip_for(svr)
38
38
  "#{Chef::Config.host_network_base}.#{(Chef::Config.host_network_ip_mapping[svr.facet_name] || 30) + svr.facet_index}"
39
39
  end
40
40
 
41
41
  # FIXME: things like this should be imputed by the `cloud` statement
42
- ram_mb = 640
42
+ ram_mb = Chef::Config.vagrant_ram_mb || 640
43
43
  video_ram_mb = 10
44
- cores = 2
44
+ cores = Chef::Config.vagrant_cores || 2
45
45
 
46
46
  # ===========================================================================
47
47
  #
@@ -192,7 +192,6 @@ module Ironfan
192
192
  end
193
193
  end
194
194
 
195
-
196
195
  def sync_volume_attributes
197
196
  composite_volumes.each do |vol_name, vol|
198
197
  chef_node.normal[:volumes] ||= Mash.new
@@ -203,11 +202,11 @@ module Ironfan
203
202
  def set_chef_node_attributes
204
203
  step(" setting node runlist and essential attributes")
205
204
  @chef_node.run_list = Chef::RunList.new(*@settings[:run_list])
206
- @chef_node.normal[:organization] = organization if organization
207
- @chef_node.normal[:permanent] = cloud.permanent if cloud.permanent
208
- @chef_node.override[:cluster_name] = cluster_name
209
- @chef_node.override[:facet_name] = facet_name
210
- @chef_node.override[:facet_index] = facet_index
205
+ @chef_node.normal[:organization] = organization if organization
206
+ @chef_node.normal[:permanent] = cloud.permanent if cloud.permanent
207
+ @chef_node.normal[:cluster_name] = cluster_name
208
+ @chef_node.normal[:facet_name] = facet_name
209
+ @chef_node.normal[:facet_index] = facet_index
211
210
  end
212
211
 
213
212
  def set_chef_node_environment
@@ -197,6 +197,10 @@ module Ironfan
197
197
  #
198
198
  def composite_volumes
199
199
  vols = {}
200
+ self.volumes.each do |vol_name, vol|
201
+ vols[vol_name] ||= self.volumes[vol_name].dup
202
+ vols[vol_name].reverse_merge!(vol)
203
+ end
200
204
  facet.volumes.each do |vol_name, vol|
201
205
  self.volumes[vol_name] ||= Ironfan::Volume.new(:parent => self, :name => vol_name)
202
206
  vols[vol_name] ||= self.volumes[vol_name].dup
@@ -28,6 +28,7 @@ module Ironfan
28
28
  :formattable => false,
29
29
  :in_raid => false,
30
30
  }
31
+ def self.defaults(hsh) VOLUME_DEFAULTS.merge(hsh) ; end
31
32
 
32
33
  # Snapshot for snapshot_name method.
33
34
  # Set your own by adding
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ironfan
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.1.6
4
+ version: 3.1.7
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: 2012-06-24 00:00:00.000000000 Z
12
+ date: 2012-07-24 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: chef
16
- requirement: &70096497952380 !ruby/object:Gem::Requirement
16
+ requirement: &70201801398780 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 0.10.4
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70096497952380
24
+ version_requirements: *70201801398780
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: fog
27
- requirement: &70096497951860 !ruby/object:Gem::Requirement
27
+ requirement: &70201801398300 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '1.2'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70096497951860
35
+ version_requirements: *70201801398300
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: formatador
38
- requirement: &70096497951280 !ruby/object:Gem::Requirement
38
+ requirement: &70201801397280 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0.2'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70096497951280
46
+ version_requirements: *70201801397280
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: gorillib
49
- requirement: &70096497950680 !ruby/object:Gem::Requirement
49
+ requirement: &70201801396800 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ~>
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0.1'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *70096497950680
57
+ version_requirements: *70201801396800
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: bundler
60
- requirement: &70096497950160 !ruby/object:Gem::Requirement
60
+ requirement: &70201801396320 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '1.1'
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *70096497950160
68
+ version_requirements: *70201801396320
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: jeweler
71
- requirement: &70096497949600 !ruby/object:Gem::Requirement
71
+ requirement: &70201801395840 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '1.6'
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *70096497949600
79
+ version_requirements: *70201801395840
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: rspec
82
- requirement: &70096497949080 !ruby/object:Gem::Requirement
82
+ requirement: &70201801395360 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ~>
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '2.5'
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *70096497949080
90
+ version_requirements: *70201801395360
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: yard
93
- requirement: &70096497948540 !ruby/object:Gem::Requirement
93
+ requirement: &70201801394880 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: '0.6'
99
99
  type: :development
100
100
  prerelease: false
101
- version_requirements: *70096497948540
101
+ version_requirements: *70201801394880
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: redcarpet
104
- requirement: &70096497947960 !ruby/object:Gem::Requirement
104
+ requirement: &70201801394400 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ~>
@@ -109,7 +109,7 @@ dependencies:
109
109
  version: '2'
110
110
  type: :development
111
111
  prerelease: false
112
- version_requirements: *70096497947960
112
+ version_requirements: *70201801394400
113
113
  description: Ironfan allows you to orchestrate not just systems but clusters of machines.
114
114
  It includes a powerful layer on top of knife and a collection of cloud cookbooks.
115
115
  email: coders@infochimps.com
@@ -228,7 +228,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
228
228
  version: '0'
229
229
  segments:
230
230
  - 0
231
- hash: 237204052974286677
231
+ hash: 2550767254429275141
232
232
  required_rubygems_version: !ruby/object:Gem::Requirement
233
233
  none: false
234
234
  requirements: