Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: nathanmarz/storm-deploy
base: master
...
head fork: palletops/storm-deploy
compare: master
Checking mergeability… Don't worry, you can still create the pull request.
  • 1 commit
  • 3 files changed
  • 0 commit comments
  • 1 contributor
Commits on Mar 01, 2013
@tbatchelli tbatchelli Add comments about where changes should take place to support
providers other than jclouds/aws.
f38a60f
View
24 project.clj
@@ -12,8 +12,8 @@
:dependencies [
[storm "0.5.4"]
[commons-codec "1.4"]
- [org.cloudhoist/pallet "0.7.2"]
- [org.cloudhoist/pallet-jclouds "1.4.2"]
+ [org.cloudhoist/pallet "0.7.3"]
+ [org.cloudhoist/pallet-jclouds "1.5.2"]
[org.cloudhoist/java "0.5.0"]
[org.cloudhoist/git "0.5.0"]
[org.cloudhoist/ssh-key "0.5.0"]
@@ -24,16 +24,16 @@
[org.cloudhoist/nagios-config "0.5.0"]
[org.cloudhoist/crontab "0.5.0"]
- [com.jcraft/jsch.agentproxy.usocket-jna "0.0.5"]
- [com.jcraft/jsch.agentproxy.usocket-nc "0.0.5"]
- [com.jcraft/jsch.agentproxy.sshagent "0.0.5"]
- [com.jcraft/jsch.agentproxy.pageant "0.0.5"]
- [com.jcraft/jsch.agentproxy.core "0.0.5"]
- [com.jcraft/jsch.agentproxy.jsch "0.0.5"]
- [com.jcraft/jsch "0.1.49"]
- [org.jclouds.driver/jclouds-sshj "1.4.2"]
- [org.jclouds.provider/aws-ec2 "1.4.2"]
- [org.jclouds.provider/aws-s3 "1.4.2"]
+; [com.jcraft/jsch.agentproxy.usocket-jna "0.0.5"]
+; [com.jcraft/jsch.agentproxy.usocket-nc "0.0.5"]
+; [com.jcraft/jsch.agentproxy.sshagent "0.0.5"]
+; [com.jcraft/jsch.agentproxy.pageant "0.0.5"]
+; [com.jcraft/jsch.agentproxy.core "0.0.5"]
+; [com.jcraft/jsch.agentproxy.jsch "0.0.5"]
+; [com.jcraft/jsch "0.1.49"]
+ [org.jclouds.driver/jclouds-sshj "1.5.5"]
+ [org.jclouds.provider/aws-ec2 "1.5.5"]
+ [org.jclouds.provider/aws-s3 "1.5.5"]
[log4j/log4j "1.2.14"]
[jvyaml "1.0.0"]]
View
7 src/clj/backtype/storm/crate/storm.clj
@@ -20,6 +20,13 @@
([] (storm-config "default"))
([conf-name] (compute-service-properties (pallet-config) [conf-name])))
+
+;; 20130301 -- Toni: These -ip functions use jclouds directly to
+;; obtain the nodes in a group, and also use pallet-jclouds to then
+;; convert jclouds nodes to pallet-nodes. This should be simplified
+;; and the dependency to jclouds be removed. Check how this is done
+;; for hadoop:
+;; https://github.com/pallet/pallet-hadoop/blob/develop/src/pallet_hadoop/node.clj#L276
(defn nimbus-ip [compute name]
(let [running-nodes (filter running? (map (partial jclouds-node->node compute) (nodes-in-group compute (str "nimbus-" name))))]
(assert (= (count running-nodes) 1))
View
18 src/clj/backtype/storm/provision.clj
@@ -16,11 +16,14 @@
(log-capture! "java.logging")
+
+;; 20130301 -- Toni: my-region assumes jclouds
;; memoize this
(defn my-region []
(-> (pallet.configure/pallet-config) :services :default :jclouds.regions)
)
+;; 20130301 -- Toni: assumes jclouds
(defn jclouds-group [& group-pieces]
(str "jclouds#"
(apply str group-pieces)
@@ -28,6 +31,7 @@
(my-region)
))
+;; 20130301 -- Toni: assumes jclouds
(defn- print-ips-for-tag! [aws tag-str]
(let [running-node (filter running? (map (partial pallet.compute.jclouds/jclouds-node->node aws) (nodes-in-group aws tag-str)))]
(info (str "TAG: " tag-str))
@@ -78,15 +82,18 @@
)
(debug "Finished converge")
- (authorize-group aws (my-region) (jclouds-group "nimbus-" name) (jclouds-group "supervisor-" name))
- (authorize-group aws (my-region) (jclouds-group "supervisor-" name) (jclouds-group "nimbus-" name))
- (debug "Finished authorizing groups")
+ ;; 20130301 -- Toni: disabling AWS stuff
+ ;(authorize-group aws (my-region) (jclouds-group "nimbus-" name) (jclouds-group "supervisor-" name))
+ ;(authorize-group aws (my-region) (jclouds-group "supervisor-" name) (jclouds-group "nimbus-" name))
+ ;(debug "Finished authorizing groups")
(lift nimbus :compute aws :phase [:post-configure :exec])
(lift supervisor :compute aws :phase [:post-configure :exec])
(debug "Finished post-configure and exec phases")
- (attach! aws name)
+ ;; 20130301 -- Toni: disabling AWS stuff
+ ;(attach! aws name)
+
(info "Provisioning Complete.")
(print-all-ips! aws name)))
@@ -130,7 +137,8 @@
:user
(util/resolve-keypaths))
]
- (System/setProperty "jna.nosys" "true")
+ ;; 20130301 -- Toni: not needed with pallet 0.7.3
+ ;;(System/setProperty "jna.nosys" "true")
(with-var-roots [node/*USER* user]
(with-command-line args
"Provisioning tool for Storm Clusters"

No commit comments for this range

Something went wrong with that request. Please try again.