Merge pull request #389 from kubespray/fixweave

Fix weave deployment task names
This commit is contained in:
Antoine Legrand 2016-07-30 18:26:08 -07:00 committed by GitHub
commit 4fb4ac120b
2 changed files with 13 additions and 13 deletions

View file

@ -1,20 +1,20 @@
---
- name: restart docker
- name: Weave | restart docker
command: /bin/true
notify:
- Weave | reload systemd
- Weave | reload docker
- name : Weave | reload systemd
shell: systemctl daemon-reload
when: ansible_service_mgr == "systemd"
- name: restart weave
command: /bin/true
notify:
- Weave | reload systemd
- reload weave
- name : Weave | reload systemd
shell: systemctl daemon-reload
when: ansible_service_mgr == "systemd"
- name: restart weaveproxy
command: /bin/true
notify:

View file

@ -7,17 +7,15 @@
group: root
mode: 0644
notify:
- restart docker
- Weave | restart docker
- name: Write docker.service systemd file
template:
src: systemd-docker.service
dest: /lib/systemd/system/docker.service
notify: restart docker
notify: Weave | restart docker
when: ansible_service_mgr == "systemd" and ansible_os_family != "CoreOS"
- meta: flush_handlers
- name: Weave | Install weave
command: rsync -piu "{{ local_release_dir }}/weave/bin/weave" "{{ bin_dir }}/weave"
changed_when: false
@ -37,22 +35,24 @@
group: root
mode: 0644
notify:
- restart systemd-weave
- restart weave
- name: Weave | Write weave systemd init file
template: src=weave.service.j2 dest=/etc/systemd/system/weave.service
when: ansible_service_mgr == "systemd"
notify: restart systemd-weave
notify: restart weave
- name: Weave | Write weaveproxy systemd init file
template: src=weaveproxy.service.j2 dest=/etc/systemd/system/weaveproxy.service
when: ansible_service_mgr == "systemd"
notify: restart systemd-weaveproxy
notify: restart weaveproxy
- name: Weave | Write weaveexpose systemd init file
template: src=weaveexpose.service.j2 dest=/etc/systemd/system/weaveexpose.service
when: ansible_service_mgr == "systemd"
notify: restart systemd-weaveexpose
notify: restart weaveexpose
- meta: flush_handlers
- name: Weave | Enable weave
service: name=weave enabled=yes state=started