From c7fef6cb761dbf67d2d9cb0ffa53a3df88f157ba Mon Sep 17 00:00:00 2001
From: Matthew Mosesohn <mmosesohn@mirantis.com>
Date: Sat, 30 Jul 2016 16:03:41 +0400
Subject: [PATCH] Fix weave deployment task names
---
roles/network_plugin/weave/handlers/main.yml | 10 +++++-----
roles/network_plugin/weave/tasks/main.yml | 16 ++++++++--------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/roles/network_plugin/weave/handlers/main.yml b/roles/network_plugin/weave/handlers/main.yml
index bd20781ee..f983ee579 100644
--- a/roles/network_plugin/weave/handlers/main.yml
+++ b/roles/network_plugin/weave/handlers/main.yml
@@ -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:
diff --git a/roles/network_plugin/weave/tasks/main.yml b/roles/network_plugin/weave/tasks/main.yml
index 2cd7b2a60..5703dde97 100644
--- a/roles/network_plugin/weave/tasks/main.yml
+++ b/roles/network_plugin/weave/tasks/main.yml
@@ -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
--
GitLab