Merge pull request #128 from ansibl8s/fix_calico_initd_ip

calico uses --ip option

roles/network_plugin/tasks/calico.yml

@@ -55,6 +55,10 @@
   template: src=calico/calico.conf.j2 dest=/usr/libexec/kubernetes/kubelet-plugins/net/exec/calico/calico_kubernetes.ini
   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
   template: src=calico/calico-node.service.j2 dest=/etc/systemd/system/calico-node.service
   when: init_system == "systemd"

roles/network_plugin/templates/calico/deb-calico.initd.j2

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

roles/network_plugin/templates/calico/network-environment.j2

+DEFAULT_IPV4={{ip | default(ansible_default_ipv4.address) }}
+ETCD_AUTHORITY=127.0.0.1:2379

roles/network_plugin/templates/calico/rh-calico.initd.j2

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