C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rollback 1.8.3 docker

Browse source
This commit is contained in:
ant31 2015-11-20 16:24:47 +01:00
parent e427591545
commit fb6dd60f52
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/docker/tasks/install.yml
View file

@ -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

10
roles/network_plugin/templates/calico/calico-node.service.j2
View file

@ -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