split network plugins into distinct roles

roles/network_plugin/tasks/calico.yml

@@ -1,99 +0,0 @@
----
-- name: Calico | Install calicoctl bin
-  command: rsync -piu "{{ local_release_dir }}/calico/bin/calicoctl" "{{ bin_dir }}/calicoctl"
-  register: calico_copy
-  changed_when: false
-
-- name: Calico | install calicoctl
-  file: path={{ bin_dir }}/calicoctl mode=0755 state=file
-
-- name: Calico | Create calicoctl symlink (needed by kubelet)
-  file:
-    src: /usr/local/bin/calicoctl
-    dest: /usr/bin/calicoctl
-    state: link
-
-- name: Calico | wait for etcd
-  wait_for:
-    port: 2379
-  when: inventory_hostname in groups['kube-master']
-
-- name: Calico | Check if calico network pool has already been configured
-  uri:
-    url: "http://127.0.0.1:2379/v2/keys/calico/v1/ipam/v4/pool"
-    return_content: yes
-    status_code: 200,404
-  register: calico_conf
-  run_once: true
-
-- name: Calico | Configure calico network pool for cloud
-  command: "calicoctl pool add {{ kube_pods_subnet }} --ipip --nat-outgoing"
-  run_once: true
-  when: calico_conf.status == 404 and cloud_provider is defined and cloud_provider == True
-
-- name: Calico | Configure calico network pool
-  command: "calicoctl pool add {{ kube_pods_subnet }}"
-  run_once: true
-  when: calico_conf.status == 404 and (cloud_provider is not defined or cloud_provider != True)
-
-- name: Calico | Get calico configuration from etcd
-  uri:
-    url: "http://127.0.0.1:2379/v2/keys/calico/v1/ipam/v4/pool"
-    return_content: yes
-  register: calico_pools
-  run_once: true
-
-- name: Calico | Check if calico pool is properly configured
-  fail:
-    msg: 'Only one network pool must be configured and it must be the subnet {{ kube_pods_subnet }}.
-    Please erase calico configuration and run the playbook again ("etcdctl rm --recursive /calico/v1/ipam/v4/pool")'
-  when: ( calico_pools.json['node']['nodes'] | length > 1 ) or
-        ( not calico_pools.json['node']['nodes'][0]['key'] | search(".*{{ kube_pods_subnet | ipaddr('network') }}.*") )
-  run_once: true
-
-- name: Calico | Write calico-node configuration
-  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"
-  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=0755
-  when: init_system == "sysvinit" and ansible_os_family == "Debian"
-  notify: restart calico-node
-
-- name: Calico | Write calico-node initd script
-  template: src=calico/rh-calico.initd.j2 dest=/etc/init.d/calico-node owner=root mode=0755
-  when: init_system == "sysvinit" and ansible_os_family == "RedHat"
-  notify: restart calico-node
-
-- meta: flush_handlers
-
-- name: Calico | Enable calico-node
-  service: name=calico-node enabled=yes state=started
-
-- name: Calico | Restart calico if binary changed
-  service:
-    name: calico-node
-    state: restarted
-  when: calico_copy.stdout_lines
-
-- name: Calico | Disable node mesh
-  shell: calicoctl bgp node-mesh off
-  environment:
-     ETCD_AUTHORITY: "127.0.0.1:2379"
-  when: peer_with_router|default(false) and inventory_hostname in groups['kube-node']
-
-- name: Calico | Configure peering with router(s)
-  shell: calicoctl node bgp peer add {{ item.router_id }} as {{ item.as }}
-  environment:
-     ETCD_AUTHORITY: "127.0.0.1:2379"
-  with_items: peers
-  when: peer_with_router|default(false) and inventory_hostname in groups['kube-node']

roles/network_plugin/tasks/flannel.yml

@@ -1,33 +0,0 @@
----
-- name: Flannel | Write flannel configuration
-  template:
-    src: flannel/network.json
-    dest: /etc/flannel-network.json
-    backup: yes
-
-- name: Flannel | Create flannel pod manifest
-  template:
-    src: flannel/flannel-pod.yml
-    dest: /etc/kubernetes/manifests/flannel-pod.manifest
-  notify: delete default docker bridge
-
-- name: Flannel | Wait for flannel subnet.env file presence
-  wait_for:
-    path: /run/flannel/subnet.env
-    delay: 5
-
-- name: Get flannel_subnet from subnet.env
-  shell: cat /run/flannel/subnet.env | awk -F'=' '$1 == "FLANNEL_SUBNET" {print $2}'
-  register: flannel_subnet_output
-  changed_when: false
-
-- set_fact:
-    flannel_subnet: "{{ flannel_subnet_output.stdout }}"
-
-- name: Get flannel_mtu from subnet.env
-  shell: cat /run/flannel/subnet.env | awk -F'=' '$1 == "FLANNEL_MTU" {print $2}'
-  register: flannel_mtu_output
-  changed_when: false
-
-- set_fact:
-    flannel_mtu: "{{ flannel_mtu_output.stdout }}"

roles/network_plugin/tasks/main.yml

@@ -1,30 +0,0 @@
----
-- name: "Test if network plugin is defined"
-  fail: msg="ERROR, One network_plugin variable must be defined (Flannel or Calico)"
-  when: ( kube_network_plugin is defined and kube_network_plugin == "calico" and kube_network_plugin == "flannel" ) or
-        kube_network_plugin is not defined
-
-- include: flannel.yml
-  when: kube_network_plugin == "flannel"
-
-- name: Set docker daemon options
-  template:
-    src: docker
-    dest: "{{ '/etc/sysconfig/docker-network' if ansible_os_family == 'RedHat' else '/etc/default/docker' }}"
-    owner: root
-    group: root
-    mode: 0644
-  notify:
-    - restart docker
-
-- name: Write docker.service systemd file
-  template:
-    src: systemd-docker.service
-    dest: /lib/systemd/system/docker.service
-  notify: restart docker
-  when: init_system == "systemd"
-
-- meta: flush_handlers
-
-- include: calico.yml
-  when: kube_network_plugin == "calico"