mcrain 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f545f6d11fb457a716f1c92fddcb37176812774
-  data.tar.gz: 1561509c7757f78be3c824a58ed26e3d85d4d0db
+  metadata.gz: 5a827b7fa0a1b8a568712e027c1378e0b1f9ef8a
+  data.tar.gz: 975971865b932bbbaace5fb3b6a1158b564d905b
 SHA512:
-  metadata.gz: 93b20d5949f9d9987b0bd20f3f1b692f8c1a43e9a097f9852ce501f38076af3fb8707a14a8c8341a63a8271371e0be95cf7b4ca8eec79062331bc63a79e0d378
-  data.tar.gz: ac43d72e32ab2d9dd991e2bc3a7cd4d57c16ca89eec072dd5bf44d6a48ee033e68f58bcf8755087558404eb0cb108a6407b0fedb672e367ec8e02da8a37439c5
+  metadata.gz: eda8ede3198ff5cdd6804e32f5c1cbd2ed9729efd2f5ef5076f6447faf9290aa5fb37854c3c98153339eada33d917acb4f1d7cf42451ebbf0a1ace49c1cff3da
+  data.tar.gz: 2b4ca199e94c665359f1b027ed09d6c1e1af2a25f407f2a128534be6a7332731b68e01c2bb0df4f40db105676b95962c138f2cce3b6e51b01f2e915a0aae9ec8

data/lib/mcrain/container_controller.rb

@@ -68,8 +68,16 @@ module Mcrain
       self
     end
 
+    def info
+      container.json
+    end
+
+    def name
+      info["Name"] # .sub(/\A\//, '')
+    end
+
     def ip
-      container.json["NetworkSettings"]["IPAddress"]
+      info["NetworkSettings"]["IPAddress"]
     end
 
     def ssh_uri

data/lib/mcrain/riak.rb

@@ -50,12 +50,12 @@ module Mcrain
         r = super
         r['HostConfig']['PortBindings']["8098/tcp"] = [{ 'HostPort' => http_port.to_s }]
         envs = []
-        envs << "RIAK_CLUSTER_SIZE=#{owner.cluster_size}"
+        envs << "DOCKER_RIAK_CLUSTER_SIZE=#{owner.cluster_size}"
         envs << "DOCKER_RIAK_AUTOMATIC_CLUSTERING=#{owner.automatic_clustering ? 1 : 0}"
         envs << "DOCKER_RIAK_BACKEND=#{owner.backend}"
         r['Env'] = envs unless envs.empty?
         if primary_node
-          r['HostConfig']['Links'] = ["#{primary_node.container.name}:seed"]
+          r['HostConfig']['Links'] = ["#{primary_node.name}:seed"]
         end
         return r
       end
@@ -142,7 +142,18 @@ module Mcrain
 
     def setup
       Boot2docker.setup_docker_options
-      nodes.map(&:container).each(&:start!)
+      # setup_nodes(nodes[0, 1]) # primary node
+      # setup_nodes(nodes[1..-1])
+      nodes.each do |node|
+        setup_nodes([node])
+      end
+    end
+
+    def setup_nodes(nodes)
+      return if nodes.empty?
+      containers = nodes.map(&:container)
+      containers.each(&:start!)
+
       # http://basho.co.jp/riak-quick-start-with-docker/
       #
       # "Please wait approximately 30 seconds for the cluster to stabilize"
@@ -164,6 +175,7 @@ module Mcrain
           raise msg
         end
       end
+      logger.info("container started: " << containers.map{|c| c.json}.join("\n"))
     end
 
     def teardown

data/lib/mcrain/version.rb

@@ -1,3 +1,3 @@
 module Mcrain
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mcrain
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - akm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-29 00:00:00.000000000 Z
+date: 2015-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger_pipe