Merge pull request #2898 from jbeda/docker-1.3.3

Move salt based clusters to Docker 1.3.3
This commit is contained in:
Joe Beda 2014-12-12 12:27:59 -08:00
commit 38d104b1d8

View File

@ -46,6 +46,7 @@ purge-old-docker:
- lxc-docker-1.2.0 - lxc-docker-1.2.0
- lxc-docker-1.3.0 - lxc-docker-1.3.0
- lxc-docker-1.3.1 - lxc-docker-1.3.1
- lxc-docker-1.3.2
{{ environment_file }}: {{ environment_file }}:
file.managed: file.managed:
@ -72,9 +73,9 @@ purge-old-docker:
# 7. Add the old version to purge-old-docker above. # 7. Add the old version to purge-old-docker above.
{% set storage_base='https://storage.googleapis.com/kubernetes-release/docker/' %} {% set storage_base='https://storage.googleapis.com/kubernetes-release/docker/' %}
{% set deb='lxc-docker-1.3.2_1.3.2_amd64.deb' %} {% set deb='lxc-docker-1.3.3_1.3.3_amd64.deb' %}
{% set deb_hash='sha1=e271afeba8156fda9c6e7527c21ae237974a8c51' %} {% set deb_hash='sha1=7c0f4a8016dae234e66f13f922f24987db3d3ba4' %}
{% set docker_ver='1.3.2' %} {% set docker_ver='1.3.3' %}
/var/cache/docker-install/{{ deb }}: /var/cache/docker-install/{{ deb }}:
file.managed: file.managed: