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
This commit is contained in:
parent
7b309f8300
commit
ff6e229ed4
|
@ -3,54 +3,6 @@
|
||||||
set -o xtrace
|
set -o xtrace
|
||||||
set -o errexit
|
set -o errexit
|
||||||
|
|
||||||
function setup_disk {
|
|
||||||
if [[ -f /etc/nodepool/provider && ! -f /swapfile ]]; then
|
|
||||||
sudo swapoff -a
|
|
||||||
sudo dd if=/dev/zero of=/swapfile bs=1M count=4096
|
|
||||||
sudo chmod 0600 /swapfile
|
|
||||||
sudo mkswap /swapfile
|
|
||||||
sudo /sbin/swapon /swapfile
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -f /docker ]; then
|
|
||||||
sudo dd if=/dev/zero of=/docker bs=1M count=10240
|
|
||||||
sudo losetup -f /docker
|
|
||||||
DEV=$(losetup -a | awk -F: '/\/docker/ {print $1}')
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Excerpts from https://github.com/openstack-infra/devstack-gate/blob/dc49f9e6eb18e42c6b175e4e146fa8f3b7633279/functions.sh#L306
|
|
||||||
if [ -b /dev/xvde ]; then
|
|
||||||
DEV2='/dev/xvde'
|
|
||||||
if mount | grep ${DEV2} > /dev/null; then
|
|
||||||
echo "*** ${DEV2} appears to already be mounted"
|
|
||||||
echo "*** ${DEV2} unmounting and reformating"
|
|
||||||
sudo umount ${DEV2}
|
|
||||||
fi
|
|
||||||
sudo parted ${DEV2} --script -- mklabel msdos
|
|
||||||
sync
|
|
||||||
sudo partprobe
|
|
||||||
sudo mkfs.ext4 ${DEV2}
|
|
||||||
sudo mount ${DEV2} /mnt
|
|
||||||
sudo find /opt/ -mindepth 1 -maxdepth 1 -exec mv {} /mnt/ \;
|
|
||||||
sudo umount /mnt
|
|
||||||
sudo mount ${DEV2} /opt
|
|
||||||
grep -q ${DEV2} /proc/mounts || exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Format Disks and setup Docker to use BTRFS
|
|
||||||
sudo parted ${DEV} -s -- mklabel msdos
|
|
||||||
sudo rm -rf /var/lib/docker
|
|
||||||
sudo mkdir /var/lib/docker
|
|
||||||
|
|
||||||
# We want to snapshot the entire docker directory so we have to first create a
|
|
||||||
# subvolume and use that as the root for the docker directory.
|
|
||||||
sudo mkfs.btrfs -f ${DEV}
|
|
||||||
sudo mount ${DEV} /var/lib/docker
|
|
||||||
sudo btrfs subvolume create /var/lib/docker/docker
|
|
||||||
sudo umount /var/lib/docker
|
|
||||||
sudo mount -o noatime,subvol=docker ${DEV} /var/lib/docker
|
|
||||||
}
|
|
||||||
|
|
||||||
# (SamYaple)TODO: Remove the path overriding
|
# (SamYaple)TODO: Remove the path overriding
|
||||||
export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
|
export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
|
||||||
|
|
||||||
|
@ -59,31 +11,11 @@ distro_id=$(lsb_release -is)
|
||||||
distro_id=${distro_id,,}
|
distro_id=${distro_id,,}
|
||||||
distro_codename=$(lsb_release -cs)
|
distro_codename=$(lsb_release -cs)
|
||||||
|
|
||||||
sudo apt-get update
|
|
||||||
sudo apt-get -y install apt-transport-https
|
|
||||||
sudo add-apt-repository "deb $DOCKER_REPOS_MIRROR_URL/${distro_id} ${distro_codename} stable"
|
sudo add-apt-repository "deb $DOCKER_REPOS_MIRROR_URL/${distro_id} ${distro_codename} stable"
|
||||||
curl -fsSL $DOCKER_REPOS_MIRROR_URL/${distro_id}/gpg | sudo apt-key add -
|
curl -fsSL $DOCKER_REPOS_MIRROR_URL/${distro_id}/gpg | sudo apt-key add -
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get -y install --no-install-recommends docker-ce
|
sudo apt-get -y install --no-install-recommends docker-ce
|
||||||
|
|
||||||
sudo service docker stop
|
|
||||||
if [[ ${distro_codename} == "trusty" ]]; then
|
|
||||||
sudo apt-get -y install --no-install-recommends btrfs-tools
|
|
||||||
setup_disk
|
|
||||||
echo "DOCKER_OPTS=\"-s btrfs --insecure-registry 0.0.0.0/0\"" | sudo tee /etc/default/docker
|
|
||||||
sudo mount --make-shared /run
|
|
||||||
sudo service docker start
|
|
||||||
else
|
|
||||||
sudo mkdir -p /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
|
|
||||||
EOF
|
|
||||||
sudo systemctl daemon-reload
|
|
||||||
sudo systemctl start docker
|
|
||||||
fi
|
|
||||||
|
|
||||||
sudo docker info
|
sudo docker info
|
||||||
|
|
||||||
echo "Completed $0."
|
echo "Completed $0."
|
||||||
|
|
|
@ -14,27 +14,12 @@ gpgcheck=1
|
||||||
gpgkey=$DOCKER_REPOS_MIRROR_URL/centos/gpg
|
gpgkey=$DOCKER_REPOS_MIRROR_URL/centos/gpg
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
sudo yum -y install libffi-devel openssl-devel docker-ce btrfs-progs
|
sudo yum -y install docker-ce
|
||||||
|
|
||||||
# Disable SELinux
|
# Disable SELinux
|
||||||
setenforce 0
|
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 systemctl start docker
|
||||||
sudo docker info
|
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."
|
echo "Completed $0."
|
||||||
|
|
Loading…
Reference in New Issue