From fb6dd60f52b1daf39dfff913a496f3aca9ee6793 Mon Sep 17 00:00:00 2001
From: ant31 <2t.antoine@gmail.com>
Date: Fri, 20 Nov 2015 16:24:47 +0100
Subject: [PATCH] Rollback 1.8.3 docker
---
roles/docker/tasks/install.yml | 2 +-
.../templates/calico/calico-node.service.j2 | 10 +++-------
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/roles/docker/tasks/install.yml b/roles/docker/tasks/install.yml
index e2d18d1f6..4880629a8 100644
--- a/roles/docker/tasks/install.yml
+++ b/roles/docker/tasks/install.yml
@@ -13,7 +13,7 @@
with_items:
- aufs-tools
- cgroupfs-mount
- - docker-engine=1.9.0-0~{{ ansible_distribution_release }}
+ - docker-engine=1.8.3-0~{{ ansible_distribution_release }}
- name: Copy default docker configuration
template: src=default-docker.j2 dest=/etc/default/docker backup=yes
diff --git a/roles/network_plugin/templates/calico/calico-node.service.j2 b/roles/network_plugin/templates/calico/calico-node.service.j2
index dc03d5213..18fc77006 100644
--- a/roles/network_plugin/templates/calico/calico-node.service.j2
+++ b/roles/network_plugin/templates/calico/calico-node.service.j2
@@ -6,16 +6,12 @@ After=etcd2.service
EnvironmentFile=/etc/network-environment
User=root
PermissionsStartOnly=true
-ExecStartPre={{ bin_dir }}/calicoctl checksystem --fix
-{% if inventory_hostname in groups['kube-node'] %}
{% if peer_with_router|default(false) %}
-ExecStart={{ bin_dir }}/calicoctl node --ip=${DEFAULT_IPV4} --as={{ local_as }} --kubernetes
+ExecStart={{ bin_dir }}/calicoctl node --kubernetes --ip=${DEFAULT_IPV4} --as={{ local_as }}
{% else %}
-ExecStart={{ bin_dir }}/calicoctl node --ip=${DEFAULT_IPV4} --kubernetes
+ExecStart={{ bin_dir }}/calicoctl node --kubernetes --ip=${DEFAULT_IPV4}
{% endif %}
-{% else %}
-ExecStart={{ bin_dir }}/calicoctl node --ip=${DEFAULT_IPV4}
-{% endif %}
+
RemainAfterExit=yes
Type=oneshot
--
GitLab