From ff6e229ed4526ec7cf4f2e333c6ba93e1f716a51 Mon Sep 17 00:00:00 2001
From: Radosław Piliszek <radoslaw.piliszek@gmail.com>
Date: Tue, 29 Oct 2019 08:20:19 +0100
Subject: CI: clean up setup

Removes stuff which does not belong here, along with the docker
daemon systemd service overrides.

Also re-enables IPv6 on CentOS node.

Change-Id: I45238b087647e733544561d333aa560f82e2a07c
---
 tools/setup_RedHat.sh | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

(limited to 'tools/setup_RedHat.sh')

diff --git a/tools/setup_RedHat.sh b/tools/setup_RedHat.sh
index 1c96100a0..aca0ec922 100755
--- a/tools/setup_RedHat.sh
+++ b/tools/setup_RedHat.sh
@@ -14,27 +14,12 @@ gpgcheck=1
 gpgkey=$DOCKER_REPOS_MIRROR_URL/centos/gpg
 EOF
 
-sudo yum -y install libffi-devel openssl-devel docker-ce btrfs-progs
+sudo yum -y install docker-ce
 
 # Disable SELinux
 setenforce 0
 
-# Setup Docker
-sudo mkdir /etc/systemd/system/docker.service.d
-sudo tee /etc/systemd/system/docker.service.d/kolla.conf << EOF
-[Service]
-ExecStart=
-ExecStart=/usr/bin/dockerd --storage-driver overlay2 --insecure-registry=0.0.0.0/0
-MountFlags=shared
-EOF
-
-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.d/disable_ipv6.conf'
-sudo /usr/sbin/sysctl -p
-
 echo "Completed $0."
-- 
cgit v1.2.3