openstack
/
kolla
Code Issues Proposed changes

Fix the gate 

This patch includes two backport patches, which make the gate green and
possible to merge.

Remove the disable of ipv6 in gate

Disable ipv6 will lose the vm

Closes-Bug: #1643858
(cherry picked from commit 05a458a73963f1e08fcf7f27a5dae70de6a0e224)

Update Percona repo to current release

The Percona Repo was updated on the 14th November to version 0.1-4
this commit updates rpm based builds to reflect that change.

Closes-Bug: #1643867
(cherry picked from commit 673700618d)

Change-Id: I7316d013d9281946c1c566279cd64ecbe6b67d37
This commit is contained in:
Jeffrey Zhang 2016-11-22 20:06:10 +08:00
parent 20e334d66f
commit 72d5132104
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/base/Dockerfile.j2
View File

@ -38,7 +38,7 @@ COPY kibana.yum.repo /etc/yum.repos.d/kibana.yum.repo
# Turns on MariaDB repos throughout the RPM build
COPY mariadb.yum.repo /etc/yum.repos.d/MariaDB.repo
RUN yum -y install http://repo.percona.com/release/7/RPMS/x86_64/percona-release-0.1-3.noarch.rpm
RUN yum -y install http://repo.percona.com/release/7/RPMS/x86_64/percona-release-0.1-4.noarch.rpm
RUN rpm --import http://yum.mariadb.org/RPM-GPG-KEY-MariaDB \
&& rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Percona \

4
tools/setup_RedHat.sh
View File

@ -52,8 +52,4 @@ sudo systemctl daemon-reload
sudo systemctl start docker
sudo docker info
# disable ipv6 until we're sure routes to fedora mirrors work properly
sudo sh -c 'echo "net.ipv6.conf.all.disable_ipv6 = 1" >> /etc/sysctl.conf'
sudo /usr/sbin/sysctl -p
echo "Completed $0."