Skip to content
Snippets Groups Projects
Commit fb6dd60f authored by ant31's avatar ant31
Browse files

Rollback 1.8.3 docker

parent e4275915
Branches
Tags
No related merge requests found
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
with_items: with_items:
- aufs-tools - aufs-tools
- cgroupfs-mount - 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 - name: Copy default docker configuration
template: src=default-docker.j2 dest=/etc/default/docker backup=yes template: src=default-docker.j2 dest=/etc/default/docker backup=yes
......
...@@ -6,16 +6,12 @@ After=etcd2.service ...@@ -6,16 +6,12 @@ After=etcd2.service
EnvironmentFile=/etc/network-environment EnvironmentFile=/etc/network-environment
User=root User=root
PermissionsStartOnly=true PermissionsStartOnly=true
ExecStartPre={{ bin_dir }}/calicoctl checksystem --fix
{% if inventory_hostname in groups['kube-node'] %}
{% if peer_with_router|default(false) %} {% 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 %} {% 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 %} {% endif %}
RemainAfterExit=yes RemainAfterExit=yes
Type=oneshot Type=oneshot
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment