Merge pull request Capgemini#418 from Capgemini/marathon-upgrade

Upgrade marathon.
monstrs · Jul 23, 2015 · 7ca001e · 7ca001e
2 parents f6a8398 + 0fa98be
commit 7ca001e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/packer/ubuntu-14.04_amd64-amis.json b/packer/ubuntu-14.04_amd64-amis.json
@@ -3,7 +3,7 @@
     "aws_access_key": "{{env `AWS_ACCESS_KEY_ID`}}",
     "aws_secret_key": "{{env `AWS_ACCESS_KEY`}}",
     "mesos_version": "0.22.1-1.0.ubuntu1404",
-    "marathon_version": "v0.9.0-RC3",
+    "marathon_version": "v0.9.0",
     "chronos_version": "chronos-2.3.4-1.0.81.ubuntu1404-mesos-0.22.1-1.0.ubuntu1404",
     "consul_version": "0.5.2",
     "weave_version": "1.0.1",

diff --git a/packer/ubuntu-14.04_amd64-droplet.json b/packer/ubuntu-14.04_amd64-droplet.json
@@ -6,7 +6,7 @@
     "digitalocean_image": "{{env `DIGITALOCEAN_IMAGE`}}",
     "mesos_version": "0.22.1-1.0.ubuntu1404",
     "chronos_version": "chronos-2.3.4-1.0.81.ubuntu1404-mesos-0.22.1-1.0.ubuntu1404",
-    "marathon_version": "v0.9.0-RC3",
+    "marathon_version": "v0.9.0",
     "consul_version": "0.5.2",
     "weave_version": "1.0.1",
     "version": "{{env `APOLLO_VERSION`}}"

diff --git a/packer/ubuntu-14.04_amd64-google.json b/packer/ubuntu-14.04_amd64-google.json
@@ -5,7 +5,7 @@
     "source_image": "{{env `GCS_SOURCE_IMAGE`}}",
     "zone": "{{env `GCS_ZONE`}}",
     "mesos_version": "0.22.1-1.0.ubuntu1404",
-    "marathon_version": "v0.9.0-RC3",
+    "marathon_version": "v0.9.0",
     "chronos_version": "chronos-2.3.4-1.0.81.ubuntu1404-mesos-0.22.1-1.0.ubuntu1404",
     "consul_version": "0.5.2",
     "weave_version": "1.0.1",

diff --git a/packer/ubuntu-14.04_amd64.json b/packer/ubuntu-14.04_amd64.json
@@ -9,7 +9,7 @@
     "hostname": "ubuntu",
     "version": "{{env `APOLLO_VERSION`}}",
     "mesos_version": "0.22.1-1.0.ubuntu1404",
-    "marathon_version": "v0.9.0-RC3",
+    "marathon_version": "v0.9.0",
     "chronos_version": "chronos-2.3.4-1.0.81.ubuntu1404-mesos-0.22.1-1.0.ubuntu1404",
     "consul_version": "0.5.2",
     "weave_version": "1.0.1",

diff --git a/roles/marathon/defaults/main.yml b/roles/marathon/defaults/main.yml
@@ -2,7 +2,7 @@
 # defaults file for marathon
 marathon_consul_dir: /etc/consul.d
 marathon_enabled: true
-marathon_version: '0.8.2'
+marathon_version: '0.9.0'
 marathon_restart_policy: 'always'
 marathon_net: 'bridge'
 marathon_hostname: "{{ ansible_ssh_host }}"