Package not found. Please check the package name and try again.

ironfan 4.12.2 → 4.12.3

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 (6) hide show
  1. data/CHANGELOG.md +4 -0
  2. data/VERSION +1 -1
  3. data/ironfan.gemspec +3 -3
  4. data/lib/chef/knife/cluster_ssh.rb +10 -2
  5. data/lib/ironfan/dsl/volume.rb +3 -2
  6. metadata +21 -21
data/CHANGELOG.md CHANGED
@@ -1,3 +1,7 @@
1
+ # v4.12.3
2
+ * Use the Ironfan hostname for cluster_ssh display (thanks @meekmichael)
3
+ * Add blank_xfs snapshot for Tokyo
4
+
1
5
  # v4.12.2
2
6
  * REALM discovery aids cleanup: see https://github.com/infochimps-labs/ironfan/pull/310 for details
3
7
 
data/VERSION CHANGED
@@ -1 +1 @@
1
- 4.12.2
1
+ 4.12.3
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 = "4.12.2"
8
+ s.version = "4.12.3"
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 = "2013-09-29"
12
+ s.date = "2013-10-10"
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 = [
@@ -162,7 +162,7 @@ Gem::Specification.new do |s|
162
162
  s.require_paths = ["lib"]
163
163
  s.rubygems_version = "1.8.23"
164
164
  s.summary = "Infochimps' lightweight cloud orchestration toolkit, built on top of Chef."
165
- s.test_files = ["spec/spec_helper/dummy_chef.rb", "spec/integration/spec_helper/launch_cluster.rb", "spec/integration/minimal-chef-repo/roles/systemwide.rb", "spec/integration/minimal-chef-repo/chefignore", "spec/integration/minimal-chef-repo/knife/credentials/knife-org.rb", "spec/integration/minimal-chef-repo/knife/knife.rb", "spec/integration/minimal-chef-repo/environments/_default.json", "spec/integration/spec/simple_cluster_spec.rb", "spec/integration/spec/elb_build_spec.rb", "spec/integration/spec_helper.rb", "spec/test_config.rb", "spec/chef/cluster_bootstrap_spec.rb", "spec/chef/cluster_launch_spec.rb", "spec/fixtures/gunbai_slice.json", "spec/fixtures/knife/knife.rb", "spec/fixtures/ec2/elb/snakeoil.crt", "spec/fixtures/ec2/elb/snakeoil.key", "spec/fixtures/gunbai.rb", "spec/spec_helper.rb", "spec/ironfan/cluster_spec.rb", "spec/ironfan/ec2/cloud_provider_spec.rb", "spec/ironfan/ec2/elb_spec.rb", "spec/ironfan/ec2/security_group_spec.rb"]
165
+ s.test_files = ["spec/fixtures/gunbai.rb", "spec/fixtures/ec2/elb/snakeoil.key", "spec/fixtures/ec2/elb/snakeoil.crt", "spec/fixtures/gunbai_slice.json", "spec/fixtures/knife/knife.rb", "spec/test_config.rb", "spec/ironfan/ec2/cloud_provider_spec.rb", "spec/ironfan/ec2/elb_spec.rb", "spec/ironfan/ec2/security_group_spec.rb", "spec/ironfan/cluster_spec.rb", "spec/spec_helper.rb", "spec/spec_helper/dummy_chef.rb", "spec/chef/cluster_bootstrap_spec.rb", "spec/chef/cluster_launch_spec.rb", "spec/integration/spec/elb_build_spec.rb", "spec/integration/spec/simple_cluster_spec.rb", "spec/integration/spec_helper.rb", "spec/integration/minimal-chef-repo/chefignore", "spec/integration/minimal-chef-repo/roles/systemwide.rb", "spec/integration/minimal-chef-repo/environments/_default.json", "spec/integration/minimal-chef-repo/knife/credentials/knife-org.rb", "spec/integration/minimal-chef-repo/knife/knife.rb", "spec/integration/spec_helper/launch_cluster.rb"]
166
166
 
167
167
  if s.respond_to? :specification_version then
168
168
  s.specification_version = 3
data/lib/chef/knife/cluster_ssh.rb CHANGED
@@ -53,6 +53,13 @@ class Chef
53
53
 
54
54
  (ui.fatal("No nodes returned from search!"); exit 10) if addresses.nil? || addresses.length == 0
55
55
 
56
+ @hostname_to_ironfan_hostname = Hash[
57
+ target.map do |c|
58
+ [c.machine.public_hostname, c.machine.tags['Name']]
59
+ end
60
+ ]
61
+ @longest_ironfan_hostname = @hostname_to_ironfan_hostname.values.group_by(&:size).max.last[0].size
62
+
56
63
  session_from_list(addresses)
57
64
  end
58
65
 
@@ -61,11 +68,12 @@ class Chef
61
68
  # if non-null)
62
69
  #
63
70
  def print_data(host, data, err=nil)
71
+ display_hostname = @hostname_to_ironfan_hostname[host]
64
72
  if data =~ /\n/
65
73
  data.split(/\n/).each { |d| print_data(host, d, err) }
66
74
  else
67
- padding = @longest - host.length
68
- str = ui.color(host, :cyan) + (" " * (padding + 1)) + (err ? ui.color(data, :red) : data)
75
+ padding = @longest_ironfan_hostname - display_hostname.length
76
+ str = ui.color(display_hostname, :cyan) + (" " * (padding + 1)) + (err ? ui.color(data, :red) : data)
69
77
  ui.msg(str)
70
78
  end
71
79
  end
data/lib/ironfan/dsl/volume.rb CHANGED
@@ -26,8 +26,9 @@ module Ironfan
26
26
 
27
27
  VOLUME_IDS ||= {}
28
28
  VOLUME_IDS.merge!({
29
- :blank_xfs => 'snap-d9c1edb1',
30
- })
29
+ :blank_xfs => 'snap-d9c1edb1',
30
+ :blank_xfs_tokyo => 'snap-049d1921',
31
+ })
31
32
 
32
33
  def snapshot_id(*)
33
34
  Ironfan.todo("CODE SMELL: EBS specific information in Dsl::Volume::VOLUME_IDS")
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: 4.12.2
4
+ version: 4.12.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-09-29 00:00:00.000000000 Z
12
+ date: 2013-10-10 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: chef
@@ -382,7 +382,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
382
382
  version: '0'
383
383
  segments:
384
384
  - 0
385
- hash: 4472391313830122724
385
+ hash: 3013468208602296528
386
386
  required_rubygems_version: !ruby/object:Gem::Requirement
387
387
  none: false
388
388
  requirements:
@@ -396,26 +396,26 @@ signing_key:
396
396
  specification_version: 3
397
397
  summary: Infochimps' lightweight cloud orchestration toolkit, built on top of Chef.
398
398
  test_files:
399
- - spec/spec_helper/dummy_chef.rb
400
- - spec/integration/spec_helper/launch_cluster.rb
401
- - spec/integration/minimal-chef-repo/roles/systemwide.rb
402
- - spec/integration/minimal-chef-repo/chefignore
403
- - spec/integration/minimal-chef-repo/knife/credentials/knife-org.rb
404
- - spec/integration/minimal-chef-repo/knife/knife.rb
405
- - spec/integration/minimal-chef-repo/environments/_default.json
406
- - spec/integration/spec/simple_cluster_spec.rb
407
- - spec/integration/spec/elb_build_spec.rb
408
- - spec/integration/spec_helper.rb
409
- - spec/test_config.rb
410
- - spec/chef/cluster_bootstrap_spec.rb
411
- - spec/chef/cluster_launch_spec.rb
399
+ - spec/fixtures/gunbai.rb
400
+ - spec/fixtures/ec2/elb/snakeoil.key
401
+ - spec/fixtures/ec2/elb/snakeoil.crt
412
402
  - spec/fixtures/gunbai_slice.json
413
403
  - spec/fixtures/knife/knife.rb
414
- - spec/fixtures/ec2/elb/snakeoil.crt
415
- - spec/fixtures/ec2/elb/snakeoil.key
416
- - spec/fixtures/gunbai.rb
417
- - spec/spec_helper.rb
418
- - spec/ironfan/cluster_spec.rb
404
+ - spec/test_config.rb
419
405
  - spec/ironfan/ec2/cloud_provider_spec.rb
420
406
  - spec/ironfan/ec2/elb_spec.rb
421
407
  - spec/ironfan/ec2/security_group_spec.rb
408
+ - spec/ironfan/cluster_spec.rb
409
+ - spec/spec_helper.rb
410
+ - spec/spec_helper/dummy_chef.rb
411
+ - spec/chef/cluster_bootstrap_spec.rb
412
+ - spec/chef/cluster_launch_spec.rb
413
+ - spec/integration/spec/elb_build_spec.rb
414
+ - spec/integration/spec/simple_cluster_spec.rb
415
+ - spec/integration/spec_helper.rb
416
+ - spec/integration/minimal-chef-repo/chefignore
417
+ - spec/integration/minimal-chef-repo/roles/systemwide.rb
418
+ - spec/integration/minimal-chef-repo/environments/_default.json
419
+ - spec/integration/minimal-chef-repo/knife/credentials/knife-org.rb
420
+ - spec/integration/minimal-chef-repo/knife/knife.rb
421
+ - spec/integration/spec_helper/launch_cluster.rb