etcd directly in host

fix etcd configuration for nodes

fix wrong calico checksums

using a var name etcd_bin_dir

fix etcd handlers for sysvinit

using a var name etcd_bin_dir

sysvinit script

review etcd configuration

roles/etcd/tasks/configure.yml

@@ -0,0 +1,27 @@
+---
+- name: Copy etcd.service systemd file
+  template:
+    src: etcd.service.j2
+    dest: /lib/systemd/system/etcd.service
+    backup: yes
+  when: init_system == "systemd"
+  notify:
+    - restart systemd-etcd
+
+- name: Write calico-node initd script
+  template:
+    src: deb-etcd.initd.j2
+    dest: /etc/init.d/etcd
+    owner: root
+    mode: 755
+  when: init_system == "sysvinit" and ansible_os_family == "Debian"
+  notify: restart etcd
+
+- name: Create etcd environment vars file
+  template:
+    src: etcd.j2
+    dest: /etc/etcd.env
+  notify: restart etcd
+
+- name: Ensure etcd is running
+  service: name=etcd state=started enabled=yes

roles/etcd/tasks/install.yml

@@ -0,0 +1,14 @@
+---
+- name: Create etcd user
+  user: name=etcd shell=/bin/nologin home=/var/lib/etcd
+
+- name: Install etcd binaries
+  copy:
+     src={{ etcd_bin_dir }}/{{ item }}
+     dest={{ bin_dir }}
+     owner=etcd
+     mode=0755
+  with_items:
+    - etcdctl
+    - etcd
+  notify: restart etcd

roles/etcd/tasks/main.yml

@@ -1,12 +1,3 @@
 ---
-- name: Stop etcd2 service
-  service: name=etcd state=stopped
-  ignore_errors: yes
-
-- name: Create etcd pod manifest
-  template: src=etcd-pod.yml dest=/etc/kubernetes/manifests/etcd-pod.manifest
-
-- name: Check for etcd2 port (pulling image and running container)
-  wait_for:
-    port: 2379
-    delay: 5
+- include: install.yml
+- include: configure.yml