openstack/kolla-ansible
Code Issues Proposed changes

Fix gate failure

Browse Source 
* disable selinux
* Pin docker-engine version

Change-Id: I22c4bdafbeb4d2979ce29a71032cf6569e1f210b
This commit is contained in:
Jeffrey Zhang 2017-01-20 00:23:51 +08:00
parent c108c5e604
commit bda9654e53
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/setup_Debian.sh
View File

@ -57,7 +57,7 @@ source /etc/lsb-release
echo "deb http://apt.dockerproject.org/repo ubuntu-${DISTRIB_CODENAME} main" | sudo tee /etc/apt/sources.list.d/docker.list echo "deb http://apt.dockerproject.org/repo ubuntu-${DISTRIB_CODENAME} main" | sudo tee /etc/apt/sources.list.d/docker.list
add_key add_key
sudo apt-get update sudo apt-get update
sudo apt-get -y install --no-install-recommends docker-engine sudo apt-get -y install --no-install-recommends 'docker-engine=1.12.*'
sudo service docker stop sudo service docker stop
if [[ ${DISTRIB_CODENAME} == "trusty" ]]; then if [[ ${DISTRIB_CODENAME} == "trusty" ]]; then

2
tools/setup_RedHat.sh
View File

@ -44,7 +44,7 @@ gpgcheck=1
gpgkey=https://yum.dockerproject.org/gpg gpgkey=https://yum.dockerproject.org/gpg
EOF EOF
sudo yum -y install libffi-devel openssl-devel docker-engine btrfs-progs sudo yum -y install libffi-devel openssl-devel docker-engine-1.12.6 docker-engine-selinux-1.12.6 btrfs-progs
setup_disk setup_disk