diff --git a/conf/clusters.yaml b/conf/clusters.yaml index 10385af..d40e1cc 100644 --- a/conf/clusters.yaml +++ b/conf/clusters.yaml @@ -2,15 +2,17 @@ # CLUSTERS CONFIG FILE ################################################################################ -nimbus.image: "us-east-1/ami-d726abbe" #64-bit ubuntu -nimbus.hardware: "m1.large" +nimbus.image: "ap-northeast-1/ami-df4b60de" #64-bit ubuntu +nimbus.hardware: "m3.medium" +nimbus.spot.price: 0.014 supervisor.count: 2 -supervisor.image: "us-east-1/ami-d726abbe" #64-bit ubuntu on eu-east-1 -supervisor.hardware: "m1.large" -#supervisor.spot.price: 1.60 +supervisor.image: "ap-northeast-1/ami-df4b60de" #64-bit ubuntu on eu-east-1 +supervisor.hardware: "m3.medium" +supervisor.spot.price: 0.014 zookeeper.count: 1 -zookeeper.image: "us-east-1/ami-d726abbe" #64-bit ubuntu -zookeeper.hardware: "m1.large" +zookeeper.image: "ap-northeast-1/ami-df4b60de" #64-bit ubuntu +zookeeper.hardware: "m3.medium" +zookeeper.spot.price: 0.014 diff --git a/src/clj/backtype/storm/defaults.clj b/src/clj/backtype/storm/defaults.clj index 8985c8d..e3e21e0 100644 --- a/src/clj/backtype/storm/defaults.clj +++ b/src/clj/backtype/storm/defaults.clj @@ -7,7 +7,7 @@ "http://mirrors.ibiblio.org/apache/maven/maven-3/%s/binaries/apache-maven-%s-bin.tar.gz" :md5-url-template "http://www.apache.org/dist/maven/maven-3/%s/binaries/apache-maven-%s-bin.tar.gz.md5" - :version "3.2.1" + :version "3.2.5" :install-dir "/usr/local/maven3" :bin-destination "/usr/bin/mvn"} :zookeeper {:version "3.3.6"} diff --git a/src/clj/backtype/storm/node.clj b/src/clj/backtype/storm/node.clj index e73202e..b6bbdf6 100644 --- a/src/clj/backtype/storm/node.clj +++ b/src/clj/backtype/storm/node.clj @@ -127,8 +127,10 @@ ;; :security-groups ["backend"] } (assoc-with-conf-key :image-id "image") + (assoc-with-conf-key :spot-price "spot.price" :f float)) + :hardware (-> {} (assoc-with-conf-key :hardware-id "hardware") - (assoc-with-conf-key :spot-price "spot.price" :f float))))) +)))) (defn zookeeper ([name server-spec method]