docker cleanup for kubernetes
diff --git a/docker/files/default b/docker/files/default
new file mode 100644
index 0000000..e81fda0
--- /dev/null
+++ b/docker/files/default
@@ -0,0 +1,14 @@
+# Docker Upstart and SysVinit configuration file
+
+# Customize location of Docker binary (especially for development testing).
+#DOCKER="/usr/local/bin/docker"
+
+# Use DOCKER_OPTS to modify the daemon startup options.
+#DOCKER_OPTS="--dns 8.8.8.8 --dns 8.8.4.4"
+
+# If you need Docker to use an HTTP proxy, it can also be specified here.
+#export http_proxy="http://127.0.0.1:3128/"
+
+# This is also a handy place to tweak where Docker's temporary files go.
+#export TMPDIR="/mnt/bigdrive/docker-tmp"
+export no_proxy=localhost,127.0.0.0/8,::1,/var/run/docker.sock
\ No newline at end of file
diff --git a/docker/files/docker_apt.pgp b/docker/files/docker_apt.pgp
deleted file mode 100644
index f9aa36a..0000000
--- a/docker/files/docker_apt.pgp
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-mQENBFIOqEUBCADsvqwefcPPQArws9jHF1PaqhXxkaXzeE5uHHtefdoRxQdjoGok
-HFmHWtCd9zR7hDpHE7Q4dwJtSFWZAM3zaUtlvRAgvMmfLm08NW9QQn0CP5khjjF1
-cgckhjmzQAzpEHO5jiSwl0ZU8ouJrLDgmbhT6knB1XW5/VmeECqKRyhlEK0zRz1a
-XV+4EVDySlORmFyqlmdIUmiU1/6pKEXyRBBVCHNsbnpZOOzgNhfMz8VE8Hxq7Oh8
-1qFaFXjNGCrNZ6xr/DI+iXlsZ8urlZjke5llm4874N8VPUeFQ/szmsbSqmCnbd15
-LLtrpvpSMeyRG+LoTYvyTG9QtAuewL9EKJPfABEBAAG0OURvY2tlciBSZWxlYXNl
-IFRvb2wgKHJlbGVhc2Vkb2NrZXIpIDxkb2NrZXJAZG90Y2xvdWQuY29tPokBOAQT
-AQIAIgUCUg6oRQIbLwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQ2Fdqi6iN
-IenM+QgAnOiozhHDAYGO92SmZjib6PK/1djbrDRMreCT8bnzVpriTOlEtARDXsmX
-njKSFa+HTxHi/aTNo29TmtHDfUupcfmaI2mXbZt1ixXLuwcMv9sJXKoeWwKZnN3i
-9vAM9/yAJz3aq+sTXeG2dDrhZr34B3nPhecNkKQ4v6pnQy43Mr59Fvv5CzKFa9oZ
-IoZf+Ul0F90HSw5WJ1NsDdHGrAaHLZfzqAVrqHzazw7ghe94k460T8ZAaovCaTQV
-HzTcMfJdPz/uTim6J0OergT9njhtdg2ugUj7cPFUTpsxQ1i2S8qDEQPL7kabAZZo
-Pim0BXdjsHVftivqZqfWeVFKMorchQ==
-=fRgo
------END PGP PUBLIC KEY BLOCK-----
\ No newline at end of file
diff --git a/docker/host.sls b/docker/host.sls
index 0e6a43a..679927a 100644
--- a/docker/host.sls
+++ b/docker/host.sls
@@ -1,22 +1,27 @@
{% from "docker/map.jinja" import host with context %}
{%- if host.enabled %}
-{%- if grains.os == 'Ubuntu' %}
-
-docker_repo:
- pkgrepo.managed:
- - repo: 'deb http://get.docker.io/ubuntu docker main'
- - file: '/etc/apt/sources.list.d/docker.list'
- - key_url: salt://docker/files/docker_apt.pgp
- - require_in:
- - pkg: docker_packages
-
-{%- endif %}
-
docker_packages:
pkg.latest:
- pkgs: {{ host.pkgs }}
+net.ipv4.ip_forward:
+ sysctl.present:
+ - value: 1
+
+{%- if grains.os == 'Ubuntu' %}
+
+/etc/default/docker:
+ file.managed:
+ - source: salt://docker/files/default
+ - template: jinja
+ - require:
+ - pkg: docker_packages
+ - watch_in:
+ - service: docker_service
+
+{%- endif %}
+
docker_service:
service.running:
- name: {{ host.service }}
diff --git a/docker/map.jinja b/docker/map.jinja
index b6ef018..5dfc89e 100644
--- a/docker/map.jinja
+++ b/docker/map.jinja
@@ -13,7 +13,7 @@
'service': 'docker'
},
'Ubuntu': {
- 'pkgs': ['iptables', 'ca-certificates', 'lxc', 'lxc-docker'],
+ 'pkgs': ['docker-engine'],
'service': 'docker'
},
}, grain='os', merge=salt['pillar.get']('docker:host')) %}
\ No newline at end of file