Project update

hugoduncan · Aug 25, 2011 · e704c7e · e704c7e
1 parent 564cc5f
commit e704c7e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/pallet/task/my_deploy.clj b/src/pallet/task/my_deploy.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])
diff --git a/src/servlet_test/ops/crate.clj b/src/servlet_test/ops/crate.clj
@@ -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"))))

diff --git a/src/servlet_test/ops/nodes.clj b/src/servlet_test/ops/nodes.clj
@@ -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"