Merge pull request #2 from jolexa/master

Support v2.3.4
AnsibleShipyard · Jul 17, 2015 · 0a0afe9 · 0a0afe9
2 parents 5859e93 + afaea4c
commit 0a0afe9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/tasks/deploy.yml b/tasks/deploy.yml
@@ -18,11 +18,11 @@
   command: mvn package chdir={{chronos_source_dir}}
 
 - name: Copy {{chronos_target_jar_location}} chronos to {{chronos_install_jar}}
-  shell: mv {{chronos_target_jar_location}}/{{chronos_app_name}}-{{chronos_version}}_mesos*.jar {{chronos_install_jar}}
+  shell: mv {{chronos_target_jar_location}}/{{chronos_app_name}}-{{chronos_version}}.jar {{chronos_install_jar}}
 
 # == Install ==
 - name: Set permissions on {{chronos_install_jar}}
-  file: path={{chronos_install_jar}} 
+  file: path={{chronos_install_jar}}
     state=file
     force=yes
     owner=root

diff --git a/templates/chronos.j2 b/templates/chronos.j2
@@ -15,7 +15,7 @@ script
   exec java \
     ${MEM_OPTS:+$MEM_OPTS} \
     ${LIB_PATH:+-Djava.library.path=$LIB_PATH} \
-    ${CHRONOS_JAR:+-cp $CHRONOS_JAR com.airbnb.scheduler.Main} \
+    ${CHRONOS_JAR:+-cp $CHRONOS_JAR org.apache.mesos.chronos.scheduler.Main} \
     ${ZK_HOSTS:+--zk_hosts "$ZK_HOSTS"} \
     ${MASTER:+--master $MASTER} \
     ${HTTP_PORT:+--http_port $HTTP_PORT} \

diff --git a/vars/main.yml b/vars/main.yml
@@ -8,8 +8,7 @@ chronos_app_name: "chronos" # see Aurora
 chronos_source_dir: "/tmp/{{chronos_app_name}}"
 
 chronos_source_repo: "https://github.com/airbnb/chronos.git"
-chronos_version: "2.1.0"
-# version: is skipped as we always go directly to source
+chronos_version: "2.3.4"
 chronos_cleanup: true
 
 # == install ==