fix some handlers

This commit is contained in:
Smaine Kahlouch 2016-01-25 21:09:42 +01:00 committed by Antoine Legrand
parent 238f6e8a0b
commit 90ffb8489a
6 changed files with 26 additions and 32 deletions

View file

@ -72,9 +72,8 @@
- name: Restart apiserver
command: "/bin/true"
notify: restart kube-apiserver
when: is_gentoken_calico|default(false) or kube_apiserver_copy.stdout_lines
when: is_gentoken_calico|default(false)
# reload-systemd
- meta: flush_handlers
- name: Enable apiserver
@ -127,9 +126,3 @@
name: kubelet
state: restarted
changed_when: false
- name: Enable apiserver
service:
name: kube-apiserver
enabled: yes
state: started

View file

@ -1,8 +1,8 @@
[Unit]
Description=Kubernetes API Server
Documentation=https://github.com/GoogleCloudPlatform/kubernetes
Requires=kube-apiserver.service
After=kube-apiserver.service
Requires=etcd.service
After=etcd.service
[Service]
EnvironmentFile=/etc/kubernetes/kube-apiserver.env

View file

@ -7,7 +7,7 @@
command: /bin/true
notify:
- reload systemd
- restart kubelet
- reload kubelet
- name: set is_gentoken_calico fact
set_fact:

View file

@ -1,16 +1,16 @@
---
- name: restart systemd-calico-node
- name: restart calico-node
command: /bin/true
notify:
- reload systemd
- restart calico-node
- reload calico-node
- name: restart systemd-docker
- name: restart docker
command: /bin/true
notify:
- reload systemd
- restart docker
- restart kubelet
- reload docker
- reload kubelet
- name: delete default docker bridge
command: ip link delete docker0
@ -19,18 +19,19 @@
- name : reload systemd
shell: systemctl daemon-reload
when: init_system == "systemd"
- name: restart calico-node
- name: reload calico-node
service:
name: calico-node
state: restarted
- name: restart docker
- name: reload docker
service:
name: docker
state: restarted
- name: restart kubelet
- name: reload kubelet
service:
name: kubelet
state: restarted

View file

@ -57,7 +57,7 @@
- name: Calico | Write calico-node systemd init file
template: src=calico/calico-node.service.j2 dest=/etc/systemd/system/calico-node.service
when: init_system == "systemd"
notify: restart systemd-calico-node
notify: restart calico-node
- name: Calico | Write calico-node initd script
template: src=calico/deb-calico.initd.j2 dest=/etc/init.d/calico-node owner=root mode=755

View file

@ -21,7 +21,7 @@
template:
src: systemd-docker.service
dest: /lib/systemd/system/docker.service
notify: restart systemd-docker
notify: restart docker
when: init_system == "systemd"
- meta: flush_handlers