Permalink
Browse files

Project update

  • Loading branch information...
1 parent 564cc5f commit e704c7ecc90bb9cbb5a1bfa1395740fdab38cf7f Corey M. Hoffstein committed Aug 25, 2011
Showing with 6 additions and 4 deletions.
  1. +2 −1 src/pallet/task/my_deploy.clj
  2. +2 −2 src/servlet_test/ops/crate.clj
  3. +2 −1 src/servlet_test/ops/nodes.clj
@@ -3,6 +3,7 @@
(:require
[servlet-test.ops.nodes :as webdeploy-nodes]
pallet.core
+ pallet.utils
[org.jclouds.compute :as jcompute]
[clojure.contrib.logging :as log]))
@@ -13,4 +14,4 @@
(pallet.core/converge {webdeploy-nodes/groupserver 1}
:compute cloud-service
- :phase :deploy))
+ :phase [:configure :deploy])
@@ -24,9 +24,9 @@
; allow tomcat to run on ports < 1024
:AUTHBIND "yes")
(tomcat/server-configuration
- (tomcat/server
+ (tomcat/server :port port
(tomcat/service
- (tomcat/engine "Catalina" "host" (tomcat/valve :request-dumper))
+ (tomcat/engine "catalina" "host" (tomcat/valve :request-dumper))
(tomcat/connector :port (str port) :protocol "HTTP/1.1"
:connectionTimeout "20000"
:redirectPort "8443"))))
@@ -26,7 +26,8 @@
(def nodespec (pallet.core/node-spec
:image {:os-family :ubuntu
:os-description-matches "10.10"}
- :hardware {:min-ram 512}
+ :hardware {:min-ram 512
+ :hardware-id "t1.micro"}
;; can optionally require cloud-specific images and node sizes if you like
;; (strongly recommended for real usage!)
;; :image-id "us-east-1/ami-508c7839"

0 comments on commit e704c7e

Please sign in to comment.