Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions conf/clusters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion src/clj/backtype/storm/defaults.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand Down
4 changes: 3 additions & 1 deletion src/clj/backtype/storm/node.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down