From 9f995df29cbcc5f9f4db1ee05067724b16118c65 Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Mon, 18 Jan 2016 14:12:09 -0500
Subject: [PATCH] AWS: Use Docker 1.8.3 on Ubuntu vivid

This currently requires downloading from the Docker repository, until we
get the packages uploaded to Google Cloud Storage.

Issue #19796
---
 cluster/saltbase/salt/docker/init.sls | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/cluster/saltbase/salt/docker/init.sls b/cluster/saltbase/salt/docker/init.sls
index 281097d5c73..0a6e2e1fcc2 100644
--- a/cluster/saltbase/salt/docker/init.sls
+++ b/cluster/saltbase/salt/docker/init.sls
@@ -99,6 +99,8 @@ net.ipv4.ip_forward:
 
 {% set storage_base='https://storage.googleapis.com/kubernetes-release/docker/' %}
 
+{% set override_deb_url='' %}
+
 {% if grains.get('cloud', '') == 'gce'
    and grains.get('os_family', '') == 'Debian'
    and grains.get('oscodename', '') == 'wheezy' -%}
@@ -106,6 +108,16 @@ net.ipv4.ip_forward:
 {% set override_deb='' %}
 {% set override_deb_sha1='' %}
 {% set override_docker_ver='' %}
+# Ubuntu presents as os_family=Debian, osfullname=Ubuntu
+{% elif grains.get('cloud', '') == 'aws'
+   and grains.get('os_family', '') == 'Debian'
+   and grains.get('oscodename', '') == 'vivid' -%}
+# TODO: Get from google storage?
+{% set docker_pkg_name='docker-engine-1.8.3' %}
+{% set override_docker_ver='1.8.3' %}
+{% set override_deb='docker-engine_1.8.3-0~vivid_amd64.deb' %}
+{% set override_deb_url='http://apt.dockerproject.org/repo/pool/main/d/docker-engine/docker-engine_1.8.3-0~vivid_amd64.deb' %}
+{% set override_deb_sha1='f0259b1f04635977325c0cfa7c0006e1e5de1341' %}
 {% else %}
 {% set docker_pkg_name='lxc-docker-1.7.1' %}
 {% set override_docker_ver='1.7.1' %}
@@ -113,6 +125,10 @@ net.ipv4.ip_forward:
 {% set override_deb_sha1='81abef31dd2c616883a61f85bfb294d743b1c889' %}
 {% endif %}
 
+{% if override_deb_url == '' %}
+{% set override_deb_url=storage_base + override_deb %}
+{% endif %}
+
 {% if override_docker_ver != '' %}
 purge-old-docker-package:
   pkg.removed:
@@ -121,7 +137,7 @@ purge-old-docker-package:
 
 /var/cache/docker-install/{{ override_deb }}:
   file.managed:
-    - source: {{ storage_base }}{{ override_deb }}
+    - source: {{ override_deb_url }}
     - source_hash: sha1={{ override_deb_sha1 }}
     - user: root
     - group: root