Merge pull request #387 from kubespray/dockerwants

Fix etcd restart and calico-node unit
This commit is contained in:
Antoine Legrand 2016-07-29 07:59:22 -07:00 committed by GitHub
commit b91f8630a3
9 changed files with 32 additions and 32 deletions

View file

@ -2,14 +2,14 @@
- name: restart docker
command: /bin/true
notify:
- reload systemd
- reload docker
- Docker | reload systemd
- Docker | reload docker
- name : reload systemd
- name : Docker | reload systemd
shell: systemctl daemon-reload
when: ansible_service_mgr == "systemd"
- name: reload docker
- name: Docker | reload docker
service:
name: docker
state: restarted

View file

@ -2,18 +2,18 @@
- name: restart etcd
command: /bin/true
notify:
- reload systemd
- etcd | reload systemd
- reload etcd
- wait for etcd up
- name: restart etcd-proxy
command: /bin/true
notify:
- reload systemd
- etcd | reload systemd
- reload etcd-proxy
- wait for etcd up
- name: reload systemd
- name: etcd | reload systemd
command: systemctl daemon-reload
when: ansible_service_mgr == "systemd"

View file

@ -1,6 +1,6 @@
[Unit]
Description=etcd docker wrapper
Wants=docker.service
Wants=docker.socket
After=docker.service
[Service]

View file

@ -1,6 +1,6 @@
[Unit]
Description=etcd-proxy docker wrapper
Wants=docker.service
Wants=docker.socket
After=docker.service
[Service]

View file

@ -2,14 +2,14 @@
- name: restart kubelet
command: /bin/true
notify:
- reload systemd
- reload kubelet
- Kubelet | reload systemd
- Kubelet | reload kubelet
- name: reload systemd
- name: Kubelet | reload systemd
command: systemctl daemon-reload
when: ansible_service_mgr == "systemd"
- name: reload kubelet
- name: Kubelet | reload kubelet
service:
name: kubelet
state: restarted

View file

@ -2,15 +2,15 @@
- name: restart calico-node
command: /bin/true
notify:
- reload systemd
- reload calico-node
- Calico | reload systemd
- Calico | reload calico-node
- name : reload systemd
- name : Calico | reload systemd
shell: systemctl daemon-reload
when: ansible_service_mgr == "systemd"
- name: reload calico-node
- name: Calico | reload calico-node
service:
name: calico-node
state: restarted
sleep: 10
sleep: 10

View file

@ -1,8 +1,8 @@
[Unit]
Description=Calico per-node agent
Documentation=https://github.com/projectcalico/calico-docker
Wants=docker.service etcd-proxy.service
After=docker.service etcd-proxy.service
Wants=docker.socket
[Service]
User=root

View file

@ -7,20 +7,20 @@
- name: restart docker
command: /bin/true
notify:
- reload systemd
- reload docker
- reload kubelet
- Flannel | reload systemd
- Flannel | reload docker
- Flannel | reload kubelet
- name : reload systemd
- name : Flannel | reload systemd
shell: systemctl daemon-reload
when: ansible_service_mgr == "systemd"
- name: reload docker
- name: Flannel | reload docker
service:
name: docker
state: restarted
- name: reload kubelet
- name: Flannel | reload kubelet
service:
name: kubelet
state: restarted

View file

@ -2,32 +2,32 @@
- name: restart docker
command: /bin/true
notify:
- reload systemd
- reload docker
- Weave | reload systemd
- Weave | reload docker
- name : reload systemd
- name : Weave | reload systemd
shell: systemctl daemon-reload
when: ansible_service_mgr == "systemd"
- name: restart weave
command: /bin/true
notify:
- reload systemd
- Weave | reload systemd
- reload weave
- name: restart weaveproxy
command: /bin/true
notify:
- reload systemd
- Weave | reload systemd
- reload weaveproxy
- name: restart weaveexpose
command: /bin/true
notify:
- reload systemd
- Weave | reload systemd
- reload weaveexpose
- name: reload docker
- name: Weave | reload docker
service:
name: docker
state: restarted