Fixing issues #3 #3 and #5 #5

nirmal070125 · Nov 28, 2014 · 296b1c8 · 296b1c8
1 parent 49bad02
commit 296b1c8
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 26 deletions.
diff --git a/master.yml b/master.yml
@@ -22,8 +22,7 @@ coreos:
         [Service]
         Environment=FLEET_PUBLIC_IP=$public_ipv4
         ExecStart=/usr/bin/fleet
-
-    - name: rudder.service
+    - name: flannel.service
       command: start
       content: |
         [Unit]
@@ -32,7 +31,7 @@ coreos:
 
         [Service]
         ExecStartPre=-/usr/bin/etcdctl set /coreos.com/network/config '{"Network":"10.100.0.0/16"}'
-        ExecStart=/opt/bin/rudder -iface=$public_ipv4
+        ExecStart=/opt/bin/flanneld -iface=$public_ipv4
         Restart=always
         RestartSec=5
 
@@ -45,14 +44,14 @@ coreos:
         [Unit]
         Description=Docker Application Container Engine
         Documentation=http://docs.docker.io
-        Requires=rudder.service
-        After=rudder.service
+        Requires=flannel.service
+        After=flannel.service
 
         [Service]
-        EnvironmentFile=/run/rudder/subnet.env
+        EnvironmentFile=/run/flannel/subnet.env
         ExecStartPre=-/usr/bin/ip link set dev docker0 down
         ExecStartPre=-/usr/sbin/brctl delbr docker0
-        ExecStart=/usr/bin/docker -d -s=btrfs -H fd:// --bip=${RUDDER_SUBNET} --mtu=${RUDDER_MTU}
+        ExecStart=/usr/bin/docker -d -s=btrfs -H fd:// --bip=${FLANNEL_SUBNET} --mtu=${FLANNEL_MTU}
         Restart=always
         RestartSec=5
 
@@ -65,18 +64,19 @@ coreos:
         [Unit]
         After=etcd.service
         After=docker.service
-        ConditionFileIsExecutable=/opt/bin/apiserver
+        ConditionFileIsExecutable=/opt/bin/kube-apiserver
         Description=Kubernetes API Server
         Documentation=https://github.com/GoogleCloudPlatform/kubernetes
         Wants=etcd.service
         Wants=docker.service
 
         [Service]
-        ExecStart=/opt/bin/apiserver \
-        -address=0.0.0.0 \
-        -port=8080 \
-        -etcd_servers=http://127.0.0.1:4001 \
-        -machines=%MINION_IP_ADDRS%
+        ExecStart=/opt/bin/kube-apiserver \
+        --address=0.0.0.0 \
+        --port=8080 \
+        --etcd_servers=http://127.0.0.1:4001 \
+        --portal_net=10.0.0.0/24 \
+        --logtostderr=true \
         Restart=always
         RestartSec=5
 
@@ -89,14 +89,14 @@ coreos:
         [Unit]
         After=etcd.service
         After=docker.service
-        ConditionFileIsExecutable=/opt/bin/controller-manager
+        ConditionFileIsExecutable=/opt/bin/kube-controller-manager
         Description=Kubernetes Controller Manager
         Documentation=https://github.com/GoogleCloudPlatform/kubernetes
         Wants=etcd.service
         Wants=docker.service
 
         [Service]
-        ExecStart=/opt/bin/controller-manager -master=127.0.0.1:8080
+        ExecStart=/opt/bin/kube-controller-manager -master=127.0.0.1:8080
         Restart=always
         RestartSec=5
 
@@ -109,14 +109,14 @@ coreos:
         [Unit]
         After=etcd.service
         After=docker.service
-        ConditionFileIsExecutable=/opt/bin/scheduler
+        ConditionFileIsExecutable=/opt/bin/kube-scheduler
         Description=Kubernetes Scheduler
         Documentation=https://github.com/GoogleCloudPlatform/kubernetes
         Wants=etcd.service
         Wants=docker.service
 
         [Service]
-        ExecStart=/opt/bin/scheduler -master=127.0.0.1:8080
+        ExecStart=/opt/bin/kube-scheduler -master=127.0.0.1:8080
         Restart=always
         RestartSec=5
 
@@ -153,14 +153,14 @@ coreos:
         [Unit]
         After=etcd.service
         After=docker.service
-        ConditionFileIsExecutable=/opt/bin/proxy
+        ConditionFileIsExecutable=/opt/bin/kube-proxy
         Description=Kubernetes Proxy
         Documentation=https://github.com/GoogleCloudPlatform/kubernetes
         Wants=etcd.service
         Wants=docker.service
 
         [Service]
-        ExecStart=/opt/bin/proxy -etcd_servers=http://127.0.0.1:4001
+        ExecStart=/opt/bin/kube-proxy -etcd_servers=http://127.0.0.1:4001
         Restart=always
         RestartSec=5
 

diff --git a/minion.yml b/minion.yml
@@ -23,15 +23,15 @@ coreos:
         Environment=FLEET_PUBLIC_IP=$public_ipv4
         ExecStart=/usr/bin/fleet
 
-    - name: rudder.service
+    - name: flannel.service
       command: start
       content: |
         [Unit]
         Requires=etcd.service
         After=etcd.service
 
         [Service]
-        ExecStart=/opt/bin/rudder -iface=$public_ipv4
+        ExecStart=/opt/bin/flannel -iface=$public_ipv4
         Restart=always
         RestartSec=5
 
@@ -41,11 +41,11 @@ coreos:
         [Unit]
         Description=Docker Application Container Engine
         Documentation=http://docs.docker.io
-        Requires=rudder.service
-        After=rudder.service
+        Requires=flannel.service
+        After=flannel.service
 
         [Service]
-        EnvironmentFile=/run/rudder/subnet.env
+        EnvironmentFile=/run/flannel/subnet.env
         ExecStartPre=-/usr/bin/ip link set dev docker0 down
         ExecStartPre=-/usr/sbin/brctl delbr docker0
         ExecStart=/usr/bin/docker -d -s=btrfs -H fd:// --bip=${RUDDER_SUBNET} --mtu=${RUDDER_MTU}
@@ -85,14 +85,14 @@ coreos:
         [Unit]
         After=etcd.service
         After=docker.service
-        ConditionFileIsExecutable=/opt/bin/proxy
+        ConditionFileIsExecutable=/opt/bin/kube-proxy
         Description=Kubernetes Proxy
         Documentation=https://github.com/GoogleCloudPlatform/kubernetes
         Wants=etcd.service
         Wants=docker.service
 
         [Service]
-        ExecStart=/opt/bin/proxy -etcd_servers=http://127.0.0.1:4001
+        ExecStart=/opt/bin/kube-proxy -etcd_servers=http://127.0.0.1:4001
         Restart=always
         RestartSec=5