C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #128 from ansibl8s/fix_calico_initd_ip

Browse source 
calico uses --ip option
This commit is contained in:
Smaine Kahlouch 2016-02-01 16:32:19 +01:00
commit 98e2d6957a
4 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
roles/network_plugin/tasks/calico.yml
View file

@ -55,6 +55,10 @@
template: src=calico/calico.conf.j2 dest=/usr/libexec/kubernetes/kubelet-plugins/net/exec/calico/calico_kubernetes.ini template: src=calico/calico.conf.j2 dest=/usr/libexec/kubernetes/kubelet-plugins/net/exec/calico/calico_kubernetes.ini
notify: restart calico-node notify: restart calico-node
- name: Calico | Write /etc/network-environment
template: src=calico/network-environment.j2 dest=/etc/network-environment
when: init_system == "sysvinit"
- name: Calico | Write calico-node systemd init file - name: Calico | Write calico-node systemd init file
template: src=calico/calico-node.service.j2 dest=/etc/systemd/system/calico-node.service template: src=calico/calico-node.service.j2 dest=/etc/systemd/system/calico-node.service
when: init_system == "systemd" when: init_system == "systemd"

1
roles/network_plugin/templates/calico/deb-calico.initd.j2
View file

@ -10,6 +10,7 @@
# Description: # Description:
# Runs calico as a docker container # Runs calico as a docker container
### END INIT INFO ### END INIT INFO
set -a
PATH=/sbin:/usr/sbin:/bin:/usr/bin PATH=/sbin:/usr/sbin:/bin:/usr/bin
DESC="Calico-node Docker" DESC="Calico-node Docker"

2
roles/network_plugin/templates/calico/network-environment.j2 Normal file
View file

@ -0,0 +1,2 @@
DEFAULT_IPV4={{ip | default(ansible_default_ipv4.address) }}
ETCD_AUTHORITY=127.0.0.1:2379

1
roles/network_plugin/templates/calico/rh-calico.initd.j2
View file

@ -4,6 +4,7 @@
# #
# chkconfig: 2345 95 95 # chkconfig: 2345 95 95
# description: Daemon for calico-node (http://www.projectcalico.org/) # description: Daemon for calico-node (http://www.projectcalico.org/)
set -a
### BEGIN INIT INFO ### BEGIN INIT INFO
# Provides: calico-node # Provides: calico-node