diff options
| author | Thomas Wiest <twiest@users.noreply.github.com> | 2015-02-23 16:29:30 -0500 |
|---|---|---|
| committer | Thomas Wiest <twiest@users.noreply.github.com> | 2015-02-23 16:29:30 -0500 |
| commit | 0d0b7fa2bba160e8d04ba0f67a0de5c7a06499db (patch) | |
| tree | 72cac0d2687e089546f68103adeaea36b124a18c /roles/kubernetes_kubelet/templates | |
| parent | 89528214cdaf8cad7321079f573d844db7004b71 (diff) | |
| parent | fa3122ce4edc48f1c4f4663257a5feaa69fc8c0b (diff) | |
| download | openshift-0d0b7fa2bba160e8d04ba0f67a0de5c7a06499db.tar.gz openshift-0d0b7fa2bba160e8d04ba0f67a0de5c7a06499db.tar.bz2 openshift-0d0b7fa2bba160e8d04ba0f67a0de5c7a06499db.tar.xz openshift-0d0b7fa2bba160e8d04ba0f67a0de5c7a06499db.zip | |
Merge pull request #77 from twiest/conf_bug
Fixed bug that was causing cluster creates to fail. Cleaned up cruft.
Diffstat (limited to 'roles/kubernetes_kubelet/templates')
| -rw-r--r-- | roles/kubernetes_kubelet/templates/cadvisor.manifest | 33 | ||||
| -rw-r--r-- | roles/kubernetes_kubelet/templates/kubelet | 3 |
2 files changed, 0 insertions, 36 deletions
diff --git a/roles/kubernetes_kubelet/templates/cadvisor.manifest b/roles/kubernetes_kubelet/templates/cadvisor.manifest deleted file mode 100644 index 064803cbe..000000000 --- a/roles/kubernetes_kubelet/templates/cadvisor.manifest +++ /dev/null @@ -1,33 +0,0 @@ -version: v1beta2 -id: cadvisor-agent -containers: - - name: cadvisor - image: google/cadvisor:latest - ports: - - name: http - containerPort: 8080 - hostPort: 4194 - volumeMounts: - - name: varrun - mountPath: /var/run - readOnly: false - - name: varlibdocker - mountPath: /var/lib/docker - readOnly: true - - name: cgroups - mountPath: /sys/fs/cgroup - readOnly: true -volumes: - - name: varrun - source: - hostDir: - path: /var/run - - name: varlibdocker - source: - hostDir: - path: /var/lib/docker - - name: cgroups - source: - hostDir: - path: /sys/fs/cgroup - diff --git a/roles/kubernetes_kubelet/templates/kubelet b/roles/kubernetes_kubelet/templates/kubelet deleted file mode 100644 index fbf9321fe..000000000 --- a/roles/kubernetes_kubelet/templates/kubelet +++ /dev/null @@ -1,3 +0,0 @@ - -DAEMON_ARGS=" -etcd_servers=http://10.245.1.2:4001 -hostname_override=10.245.2.2 -address=0.0.0.0 -config=/etc/kubernetes/manifests" - |