Revert "Running etcd 2.0.5 in a pod on master"

cluster/saltbase/salt/monit/etcd

@@ -0,0 +1,9 @@
+check process etcd with pidfile /var/run/etcd.pid
+group etcd 
+start program = "/etc/init.d/etcd start"
+stop program = "/etc/init.d/etcd stop"
+if failed
+  port 4001
+  protocol http
+  request "/v2/keys/"
+then restart

cluster/saltbase/salt/monit/init.sls

@@ -4,6 +4,16 @@ monit:
   pkg:
     - installed
 
+{% if "kubernetes-master" in grains.get('roles', []) %}
+/etc/monit/conf.d/etcd:
+  file:
+    - managed
+    - source: salt://monit/etcd
+    - user: root
+    - group: root
+    - mode: 644
+{% endif %}
+
 /etc/monit/conf.d/docker:
   file:
     - managed