openstack/kolla-ansible
Code Issues Proposed changes

Merge "Unblock Docker pinning in gate"

Browse Source
This commit is contained in:
Jenkins 2016-01-04 02:51:41 +00:00 committed by Gerrit Code Review
commit 9f74f50969
4 changed files with 4 additions and 5 deletions

3
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

2
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

2
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

2
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