From 14eb92301109e45db2a34fa338dac1f903092fab Mon Sep 17 00:00:00 2001 From: Dmitry Victorov Date: Wed, 11 Jan 2017 17:17:07 -0500 Subject: [PATCH 1/6] chronos-via-marathon change --- roles/mesos-master/tasks/main.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/roles/mesos-master/tasks/main.yml b/roles/mesos-master/tasks/main.yml index 0bc9098..c886616 100644 --- a/roles/mesos-master/tasks/main.yml +++ b/roles/mesos-master/tasks/main.yml @@ -30,14 +30,20 @@ - name: Configure Marathon template: src=etc-init-marathon.conf.j2 dest=/etc/init/marathon.conf mode=0644 notify: Restart master services - +- debug: var=chronos_marathon_active - name: Configure Chronos template: src=etc-init-chronos.conf.j2 dest=/etc/init/chronos.conf mode=0644 notify: Restart master services + when: chronos_marathon_active != "yes" + +- name: Start chronos + service: name={{item}} state=started enabled=yes + with_items: + - chronos + when: chronos_marathon_active != "yes" - name: Start master services service: name={{item}} state=started enabled=yes with_items: - marathon - - chronos - mesos-master From 686351dd65b4eb27c75895f5b007c044d4735e21 Mon Sep 17 00:00:00 2001 From: Dmitry Victorov Date: Wed, 11 Jan 2017 17:23:29 -0500 Subject: [PATCH 2/6] chronos-via-marathon change --- roles/mesos-master/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/mesos-master/tasks/main.yml b/roles/mesos-master/tasks/main.yml index c886616..2ab139f 100644 --- a/roles/mesos-master/tasks/main.yml +++ b/roles/mesos-master/tasks/main.yml @@ -30,7 +30,7 @@ - name: Configure Marathon template: src=etc-init-marathon.conf.j2 dest=/etc/init/marathon.conf mode=0644 notify: Restart master services -- debug: var=chronos_marathon_active + - name: Configure Chronos template: src=etc-init-chronos.conf.j2 dest=/etc/init/chronos.conf mode=0644 notify: Restart master services From a5a04a01d133e90b0c73a3431d1b922ad9f148ca Mon Sep 17 00:00:00 2001 From: Dmitry Victorov Date: Thu, 12 Jan 2017 19:38:38 -0500 Subject: [PATCH 3/6] chronos-sync fix --- roles/chronos-sync/tasks/main.yml | 2 +- roles/mesos-master/defaults/main.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/roles/chronos-sync/tasks/main.yml b/roles/chronos-sync/tasks/main.yml index 748666f..0c35607 100644 --- a/roles/chronos-sync/tasks/main.yml +++ b/roles/chronos-sync/tasks/main.yml @@ -24,4 +24,4 @@ pip: name=awscli state=present - name: Setup chronos sync - git: repo=https://github.com/mesos/chronos.git dest=/opt/chronos + git: repo=https://github.com/mesos/chronos.git dest=/opt/chronos version={{chronos_version}} force=yes diff --git a/roles/mesos-master/defaults/main.yml b/roles/mesos-master/defaults/main.yml index d139522..4dfc52b 100644 --- a/roles/mesos-master/defaults/main.yml +++ b/roles/mesos-master/defaults/main.yml @@ -5,7 +5,6 @@ # version suffixes added by Mesosphere. To install the latest use `latest`, # to install latest 0.13 use `0.13`. marathon_version: "1.1.4" -chronos_version: "2.4.0" # Name of the Mesos cluster. cluster_name: "Mesos Stack" From 513cbf8a7cd0a30c56403d38b0db7bf4ab226783 Mon Sep 17 00:00:00 2001 From: Dmitry Victorov Date: Thu, 19 Jan 2017 17:40:43 -0500 Subject: [PATCH 4/6] fix chronos_version usage --- roles/mesos-master/defaults/main.yml | 2 +- vagrant/hosts | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/roles/mesos-master/defaults/main.yml b/roles/mesos-master/defaults/main.yml index 4dfc52b..5c3fed9 100644 --- a/roles/mesos-master/defaults/main.yml +++ b/roles/mesos-master/defaults/main.yml @@ -1,5 +1,5 @@ --- -# The Marathon and Chronos framework versions +# The Marathon framework version # # A `*` is added after the version when installing, which permits to leave out # version suffixes added by Mesosphere. To install the latest use `latest`, diff --git a/vagrant/hosts b/vagrant/hosts index 992add6..9f5a266 100644 --- a/vagrant/hosts +++ b/vagrant/hosts @@ -6,6 +6,8 @@ ansible_ssh_user=vagrant ansible_domainname=mesos.dev marathon_port=8080 +chronos_marathon_active="no" +chronos_version="2.4.0" [zookeeper] 10.141.141.10 @@ -27,4 +29,4 @@ marathon_port=8080 [glusterfs] 10.141.141.10 -10.141.141.11 \ No newline at end of file +10.141.141.11 From 98a2043c920c4b28c9b903e53773fdc64339609b Mon Sep 17 00:00:00 2001 From: Dmitry Victorov Date: Thu, 19 Jan 2017 16:47:39 -0800 Subject: [PATCH 5/6] yet another kernel update --- roles/common/tasks/RedHat.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/common/tasks/RedHat.yml b/roles/common/tasks/RedHat.yml index cdb8e6a..8800402 100644 --- a/roles/common/tasks/RedHat.yml +++ b/roles/common/tasks/RedHat.yml @@ -28,17 +28,17 @@ changed_when: true - name: update kernel-firmware - get_url: dest=/home/{{ansible_ssh_user}}/kernel-firmware.rpm url=ftp://fr2.rpmfind.net/linux/centos/6/centosplus/x86_64/Packages/kernel-firmware-2.6.32-642.1.1.el6.centos.plus.noarch.rpm mode=0644 + get_url: dest=/home/{{ansible_ssh_user}}/kernel-firmware.rpm url=ftp://fr2.rpmfind.net/linux/centos/6/centosplus/x86_64/Packages/kernel-firmware-2.6.32-642.13.1.el6.centos.plus.noarch.rpm mode=0644 when: newkernel.changed - shell: rpm -if /home/{{ansible_ssh_user}}/kernel-firmware.rpm when: newkernel.changed - name: Update kernel - yum: name=kernel-debug state=latest + yum: name=kernel-debug-2.6.32-642.13.1.el6.x86_64 state=installed when: newkernel.changed -- shell: grubby --set-default=/boot/vmlinuz-2.6.32-642.1.1.el6.x86_64.debug +- shell: grubby --set-default=/boot/vmlinuz-2.6.32-642.13.1.el6.x86_64.debug when: newkernel.changed - shell: sleep 2 && reboot From c4fa57f5762ff9531accdcbdebc52582b9f6e1f3 Mon Sep 17 00:00:00 2001 From: Dmitry Victorov Date: Wed, 1 Feb 2017 14:38:33 -0500 Subject: [PATCH 6/6] upgrade Marathon to 1.3.8 --- roles/mesos-master/defaults/main.yml | 2 +- roles/mesos-master/templates/etc-init-marathon.conf.j2 | 4 +++- roles/mesos/defaults/main.yml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/roles/mesos-master/defaults/main.yml b/roles/mesos-master/defaults/main.yml index 5c3fed9..42c5011 100644 --- a/roles/mesos-master/defaults/main.yml +++ b/roles/mesos-master/defaults/main.yml @@ -4,7 +4,7 @@ # A `*` is added after the version when installing, which permits to leave out # version suffixes added by Mesosphere. To install the latest use `latest`, # to install latest 0.13 use `0.13`. -marathon_version: "1.1.4" +marathon_version: "1.3.8" # Name of the Mesos cluster. cluster_name: "Mesos Stack" diff --git a/roles/mesos-master/templates/etc-init-marathon.conf.j2 b/roles/mesos-master/templates/etc-init-marathon.conf.j2 index e253d80..bc90e98 100644 --- a/roles/mesos-master/templates/etc-init-marathon.conf.j2 +++ b/roles/mesos-master/templates/etc-init-marathon.conf.j2 @@ -1,4 +1,6 @@ # {{ansible_managed}} +# use --mesos_authentication \ with mesos 1.x or --http_credentials "{{ mesos_http_credentials }}" \ with early versions + description "Marathon scheduler for Mesos" start on runlevel [2345] @@ -9,7 +11,7 @@ respawn limit 10 5 script /usr/bin/marathon \ - --http_credentials "{{ mesos_http_credentials }}" \ + --mesos_authentication \ --mesos_authentication_principal "{{ mesos_authentication_principal }}" \ --mesos_authentication_secret_file "{{ mesos_authentication_secret_file }}" \ --http_port {{marathon_port}} diff --git a/roles/mesos/defaults/main.yml b/roles/mesos/defaults/main.yml index 981bf36..d06fc4a 100644 --- a/roles/mesos/defaults/main.yml +++ b/roles/mesos/defaults/main.yml @@ -6,7 +6,7 @@ # to leave out version suffixes added by Mesosphere. Use `apt-policy mesos` to # see available versions. To install the latest use `latest`, to install most # recent 0.11 release use `0.11`. -mesos_version: "0.28.2" +mesos_version: "1.1.0" # Credentials used for framework authentication #