etcds 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9d26abf546465719f7072a91a3745578f4d0612
-  data.tar.gz: 382ff2fb4b05bb372481b053e530a559ec20c0b4
+  metadata.gz: 354d9bb8e06d2f23e2e36b721a9340b99e12f730
+  data.tar.gz: 521dfaa11926d4f9104b053ecdbf1773254ffb55
 SHA512:
-  metadata.gz: e0d2baec698ba7c53945167c88a369963577cb58e9ca6e48fb58008be079761049b56be44a6c87e5bf5de576b93b96eabdb564d7f49adf6c163a979f9ffd86c5
-  data.tar.gz: 11ab07e43b73faf2aa6330221ea9a26b25ae14c917c6ff090bd3d85a84e3c1852052a74b215600bc3d30d9fbc403c2f96a804aa6dce1aa7edbe2d9b9305ad355
+  metadata.gz: c9e977d14f4586a66f02c061bfd4e95556c3bd5d7c290dc7cfa3156fe1c7515e4e66917ee1623d6f55aacd7c93b7523f107790736a0958b39ad0852368958233
+  data.tar.gz: 3a6fef3d543269357902ee897c2bc6988b3d4cf01bd3c0ae00ef8074bc21612efb0f711bc2b1029be2aa04944718c1f9d522735453fa87ed401b6055f0e4c201

data/lib/etcds/version.rb

@@ -1,3 +1,3 @@
 class Etcds
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/etcds.rb

@@ -38,12 +38,12 @@ class Etcds
   end
 
   H[:init] = 'prepare ca files for all nodes'
-  def init
+  def init(domain = 'etcd')
     etcd_ca "init --passphrase ''"
     @nodes.each do |k, v|
       ip = v['ip']
       name = k
-      etcd_ca "new-cert --passphrase '' --ip #{ip} #{name}"
+      etcd_ca "new-cert --passphrase '' --ip #{ip} --domain #{domain} #{name}"
       etcd_ca "sign --passphrase '' #{name}"
       etcd_ca "export --insecure --passphrase '' #{name}" +
         " | tar -C ./certs -xvf -"
@@ -57,11 +57,13 @@ class Etcds
   H[:install] = "[names...]\tinstall ca files to the host"
   def install(*hosts)
     hosts.each do |to|
-      %w[ca.crt crt key.insecure].each do |what|
-        name = "#{to}.#{what}"
-        scp "./certs/#{name} #{to}:/tmp/"
-        ssh to, "mv /tmp/#{name} /etc/docker/certs.d"
-        ssh to, "chown root:root /etc/docker/certs.d/#{name}"
+      %W[
+        #{to}.ca.crt #{to}.crt #{to}.key.insecure
+        ca.crt client.crt client.key.insecure
+      ].each do |what|
+        scp "./certs/#{what} #{to}:/tmp/"
+        ssh to, "mv /tmp/#{what} /etc/docker/certs.d"
+        ssh to, "chown root:root /etc/docker/certs.d/#{what}"
       end
     end
   end
@@ -131,10 +133,10 @@ class Etcds
   end
 
   H[:health] = 'show cluster health for all nodes'
-  def health; for_all_run{|n| ctl n, 'cluster-health'} end
+  def health; for_all{|n| ctl n, 'cluster-health'} end
 
   H[:member] = 'show member list for all nodes'
-  def member; for_all_run{|n| ctl n, 'member list'} end
+  def member; for_all{|n| ctl n, 'member list'} end
 
   H[:ctl] = "[name] commands\tpass commands to etcdctl"
   def ctl(n, *args)
@@ -160,7 +162,7 @@ private
     IO.popen({'DOCKER_HOST' => "tcp://#{ip}:2376"}, "docker #{cmd}").read
   end
 
-  def for_all_run(&block)
+  def for_all(&block)
     @nodes.keys.each do |n|
       if run?(n)
         puts "Node #{n}:".on_blue

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etcds
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Genki Takiuchi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-16 00:00:00.000000000 Z
+date: 2015-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize