From 6ca65aba6cc01ef3e13854c19aaf4c6cbf420331 Mon Sep 17 00:00:00 2001
From: SamYaple <sam@yaple.net>
Date: Sat, 26 Dec 2015 02:20:08 +0000
Subject: [PATCH] Unblock Docker pinning in gate

Docker and docker-py can now be unpinned since Kolla has been
converted to using the kolla_docker module and we no longer rely on
upstream to unblock us.

Change-Id: I6ee2b78c31ef0447da6154b75db381d5cdd55ab6
Partially-Implements: blueprint kolla-docker-module
---
 tests/deploy_aio.sh   | 3 +--
 tests/setup_Debian.sh | 2 +-
 tests/setup_RedHat.sh | 2 +-
 tests/setup_gate.sh   | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/tests/deploy_aio.sh b/tests/deploy_aio.sh
index e82bb5233c..9ca10164b5 100755
--- a/tests/deploy_aio.sh
+++ b/tests/deploy_aio.sh
@@ -20,8 +20,7 @@ cat << EOF > /etc/kolla/globals.yml
 kolla_base_distro: "$1"
 kolla_install_type: "$2"
 kolla_internal_address: "169.254.169.10"
-docker_pull_policy: "missing"
-docker_restart_policy: "no"
+docker_restart_policy: "never"
 network_interface: "eth0"
 neutron_external_interface: "fake_interface"
 EOF
diff --git a/tests/setup_Debian.sh b/tests/setup_Debian.sh
index e2a4c939b1..10ed328751 100755
--- a/tests/setup_Debian.sh
+++ b/tests/setup_Debian.sh
@@ -12,7 +12,7 @@ export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 echo 'deb http://apt.dockerproject.org/repo ubuntu-trusty main' | sudo tee /etc/apt/sources.list.d/docker.list
 sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
 sudo apt-get update
-sudo apt-get install -y --no-install-recommends docker-engine=1.8.2-0~trusty btrfs-tools
+sudo apt-get install -y --no-install-recommends docker-engine btrfs-tools
 
 # Only do FS optimization if we have a secondary disk
 if [[ -b /dev/${DEV} ]]; then
diff --git a/tests/setup_RedHat.sh b/tests/setup_RedHat.sh
index e6b82da820..4eba9504a1 100755
--- a/tests/setup_RedHat.sh
+++ b/tests/setup_RedHat.sh
@@ -17,7 +17,7 @@ gpgcheck=1
 gpgkey=https://yum.dockerproject.org/gpg
 EOF
 
-sudo yum install -y libffi-devel openssl-devel docker-engine-1.8.2 xfsprogs
+sudo yum install -y libffi-devel openssl-devel docker-engine xfsprogs
 
 # Only do FS optimization if we have a secondary disk
 if [[ -b /dev/${DEV} ]]; then
diff --git a/tests/setup_gate.sh b/tests/setup_gate.sh
index 68cf7df039..2bd41e3969 100755
--- a/tests/setup_gate.sh
+++ b/tests/setup_gate.sh
@@ -70,7 +70,7 @@ function setup_ansible {
     RAW_INVENTORY=/tmp/kolla/raw_inventory
     mkdir /tmp/kolla
 
-    sudo -H pip install "ansible<2" "docker-py>=1.4.0,<1.6.0"
+    sudo -H pip install "ansible<2" "docker-py>=1.4.0"
 
     setup_inventory