Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kubespray
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
4fb4ac12
Commit
4fb4ac12
authored
8 years ago
by
Antoine Legrand
Committed by
GitHub
8 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #389 from kubespray/fixweave
Fix weave deployment task names
parents
6a7308d5
c7fef6cb
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
roles/network_plugin/weave/handlers/main.yml
+5
-5
5 additions, 5 deletions
roles/network_plugin/weave/handlers/main.yml
roles/network_plugin/weave/tasks/main.yml
+8
-8
8 additions, 8 deletions
roles/network_plugin/weave/tasks/main.yml
with
13 additions
and
13 deletions
roles/network_plugin/weave/handlers/main.yml
+
5
−
5
View file @
4fb4ac12
---
-
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
:
...
...
This diff is collapsed.
Click to expand it.
roles/network_plugin/weave/tasks/main.yml
+
8
−
8
View file @
4fb4ac12
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment