murakumo 0.4.0 → 0.4.1

data/bin/murakumo-show-ec2-instances

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+$: << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'optparse'
+require 'yaml'
+
+require 'util/murakumo_ec2_instances'
+
+access_key = nil
+secret_key = nil
+endpoint = nil
+instance_id = nil
+
+ARGV.options do |opt|
+  opt.on('-k', '--access-key ACCESS_KEY') {|v| access_key = v }
+  opt.on('-s', '--secret-key SECRET_KEY') {|v| secret_key = v }
+  opt.on('-r', '--region REGION') {|v| endpoint = v }
+  opt.parse!
+
+  access_key ||= ENV['AMAZON_ACCESS_KEY_ID']
+  secret_key ||= ENV['AMAZON_SECRET_ACCESS_KEY']
+
+  unless access_key and secret_key
+    puts opt.help
+    exit 1
+  end
+end
+
+instances = Murakumo::Util::ec2_instances(access_key, secret_key, endpoint)
+
+puts YAML.dump(instances)

data/bin/murakumo-show-ec2-tags

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 $: << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+
 require 'optparse'
+
 require 'util/murakumo_ec2_tags'
 
 access_key = nil

data/bin/murakumo-show-ip-address

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 $: << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+
 require 'util/murakumo_self_ip_address'
 
 puts Murakumo::Util.self_ip_address

data/etc/murakumo-init.rb.for-ec2

@@ -0,0 +1,19 @@
+AMAZON_ACCESS_KEY_ID = '...'
+AMAZON_SECRET_ACCESS_KEY = '...'
+
+# get self ip address
+ip_addr = Murakumo::Util.self_ip_address
+
+# get hostname
+tags = Murakumo::Util.ec2_tags(AMAZON_ACCESS_KEY_ID, AMAZON_SECRET_ACCESS_KEY)
+hostname = tags['Name'] || `curl -s http://169.254.169.254/latest/meta-data/local-hostname`
+
+# rewrite host option
+@options['host'] = "#{ip_addr}, #{hostname}"
+
+# get instances
+instances = Murakumo::Util.ec2_instances(AMAZON_ACCESS_KEY_ID, AMAZON_SECRET_ACCESS_KEY)
+
+# rewrite initial-nodes
+nodes = instances.map {|i| i['ipAddress'] || '' }.select {|i| not i.empty? }
+@options['initial-nodes'] = nodes.join(',') unless nodes.empty?

data/lib/cli/murakumo_initializer_context.rb

@@ -1,6 +1,7 @@
 require 'misc/murakumo_const'
 require 'util/murakumo_self_ip_address'
 require 'util/murakumo_ec2_tags'
+require 'util/murakumo_ec2_instances'
 
 module Murakumo
 

data/lib/misc/murakumo_const.rb

@@ -1,5 +1,5 @@
 module Murakumo
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 
   # Priority
   MASTER = 1

data/lib/util/murakumo_ec2_client.rb

@@ -7,14 +7,24 @@ Net::HTTP.version_1_2
 
 module Murakumo
 
-  module Util
+  class Util
 
     class EC2Client
 
       API_VERSION = '2011-12-01'
       SIGNATURE_VERSION = 2
 
-      def initialize(accessKeyId, secretAccessKey, endpoint = 'ec2.us-east-1.amazonaws.com', algorithm = :SHA256)
+      def initialize(accessKeyId, secretAccessKey, endpoint = nil, algorithm = :SHA256)
+        unless endpoint
+          local_hostname = Net::HTTP.get('169.254.169.254', '/latest/meta-data/local-hostname')
+
+          if /\A[^.]+\.([^.]+)\.compute\.internal\Z/ =~ local_hostname
+            endpoint = $1
+          else
+            endpoint = 'us-east-1'
+          end
+        end
+
         @accessKeyId = accessKeyId
         @secretAccessKey = secretAccessKey
         @endpoint = endpoint

data/lib/util/murakumo_ec2_instances.rb

@@ -0,0 +1,52 @@
+require 'net/http'
+require 'rexml/document'
+
+require 'util/murakumo_ec2_client'
+
+module Murakumo
+
+  class Util
+
+    def self.ec2_instances(access_key, secret_key, endpoint = nil)
+      ec2cli = Murakumo::Util::EC2Client.new(access_key, secret_key, endpoint)
+      source = ec2cli.query('DescribeInstances')
+      instances = []
+
+      items = REXML::Document.new(source).get_elements('//instancesSet/item')
+      walk_item_list(items, instances)
+
+      return instances
+    end
+
+    def self.walk_item_list(list, ary)
+      list.each do |item|
+        hash = {}
+        walk_item(item, hash)
+        ary << hash
+      end
+    end 
+    private_class_method :walk_item_list
+
+    def self.walk_item(item, hash)
+      return unless item.has_elements?
+
+      item.elements.each do |child|
+        if child.has_elements?
+          if child.elements.all? {|i| i.name =~ /\Aitem\Z/i }
+            hash[child.name] = nested = []
+            walk_item_list(child.elements, nested)
+          else
+            hash[child.name] = nested = {}
+            walk_item(child, nested)
+          end
+        else
+          hash[child.name] = child.text
+        end
+      end
+    end
+
+    private_class_method :walk_item
+
+  end # Util
+
+end # Murakumo

data/lib/util/murakumo_ec2_tags.rb

@@ -5,19 +5,9 @@ require 'util/murakumo_ec2_client'
 
 module Murakumo
 
-  module Util
-
-    def ec2_tags(access_key, secret_key, endpoint = nil, instance_id = nil)
-      unless endpoint
-        local_hostname = Net::HTTP.get('169.254.169.254', '/latest/meta-data/local-hostname')
-
-        if /\A[^.]+\.([^.]+)\.compute\.internal\Z/ =~ local_hostname
-          endpoint = $1
-        else
-          endpoint = 'us-east-1'
-        end
-      end
+  class Util
 
+    def self.ec2_tags(access_key, secret_key, endpoint = nil, instance_id = nil)
       unless instance_id
         instance_id = Net::HTTP.get('169.254.169.254', '/latest/meta-data/instance-id')
       end
@@ -36,8 +26,6 @@ module Murakumo
       return tags
     end
 
-    module_function :ec2_tags
-
   end # Util
 
 end # Murakumo

data/lib/util/murakumo_self_ip_address.rb

@@ -1,13 +1,11 @@
 module Murakumo
 
-  module Util
+  class Util
 
-    def self_ip_address
+    def self.self_ip_address
       `/sbin/ifconfig eth0 | awk -F'[: ]+' '/^eth0/,/^$/{if(/inet addr/) print $4}'`.strip
     end
 
-    module_function :self_ip_address
-
   end # Util
 
 end # Murakumo

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: murakumo
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - winebarrel
@@ -89,12 +89,14 @@ executables:
 - murakumo-install-init-script
 - murakumo-show-ip-address
 - murakumo-show-ec2-tags
+- murakumo-show-ec2-instances
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
 - README
+- bin/murakumo-show-ec2-instances
 - bin/murakumo
 - bin/murakumo-show-ec2-tags
 - bin/murakumo-show-ip-address
@@ -106,6 +108,7 @@ files:
 - lib/cli/murakumo_initializer_context.rb
 - lib/cli/mrkmctl_options.rb
 - lib/misc/murakumo_const.rb
+- lib/util/murakumo_ec2_instances.rb
 - lib/util/murakumo_ec2_tags.rb
 - lib/util/murakumo_self_ip_address.rb
 - lib/util/murakumo_ec2_client.rb
@@ -116,6 +119,7 @@ files:
 - lib/srv/murakumo_balancer.rb
 - lib/srv/murakumo_cloud.rb
 - etc/murakumo.server
+- etc/murakumo-init.rb.for-ec2
 - etc/murakumo.yml.example
 - etc/gai.conf.example
 - etc/murakumo-update-config-for-ec2