| commit | f9dec4d750416ea9ed178e23b42dc6700bb85b9d | [log] [tgz] |
|---|---|---|
| author | marco <m.celoud@tcpcloud.eu> | Sat Jul 02 16:11:18 2016 +0200 |
| committer | marco <m.celoud@tcpcloud.eu> | Fri Jul 08 16:31:01 2016 +0200 |
| tree | 87b8bc672abf4bf2c2a4d8d784058131cf3ec499 | |
| parent | 0a48834876a3c7a701aa6f3c93d15b968fb66355 [diff] |
add etcd configuration support
diff --git a/kubernetes/pool/kubelet.sls b/kubernetes/pool/kubelet.sls index 4667e40..69aada3 100644 --- a/kubernetes/pool/kubelet.sls +++ b/kubernetes/pool/kubelet.sls
@@ -18,6 +18,7 @@ - mode: 644 - makedirs: true +<<<<<<< HEAD /etc/kubernetes/config: file.absent