From 480e575000ec905d3023969da3d1112108c224fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Fri, 21 Jun 2019 10:48:40 +0200 Subject: [PATCH] CI - remove unused setup scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch removes old, unused setup scripts. They belong to kolla anyway. Change-Id: Ia8dcd39991177153af61c638c7ae05123da08e82 Signed-off-by: Radosław Piliszek --- tools/setup_Debian.sh | 102 ------------------------------------------ tools/setup_RedHat.sh | 84 ---------------------------------- 2 files changed, 186 deletions(-) delete mode 100755 tools/setup_Debian.sh delete mode 100755 tools/setup_RedHat.sh diff --git a/tools/setup_Debian.sh b/tools/setup_Debian.sh deleted file mode 100755 index f5417ca3cc..0000000000 --- a/tools/setup_Debian.sh +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/bash - -set -o xtrace -set -o errexit - -function add_key { - local counter=0 - - while :; do - if [[ "${counter}" -gt 5 ]]; then - echo "Failed to add Docker keyring" - exit 1 - fi - # hkp://pool.sks-keyservers.net intermittenly doesn't have the correct - # keyring. p80 is what the docker script pulls from and what we should - # use for reliability too - sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D && break || : - sleep 5 - done -} - -function setup_disk { - if [ ! -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 -export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" - -. /etc/lsb-release - -# Setup Docker repo and add signing key -echo "deb http://apt.dockerproject.org/repo ubuntu-${DISTRIB_CODENAME} main" | sudo tee /etc/apt/sources.list.d/docker.list -add_key -sudo apt-get update -sudo apt-get -y install --no-install-recommends docker-engine - -sudo service docker stop -if [[ ${DISTRIB_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 /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 -fi - -sudo docker info - -echo "Completed $0." diff --git a/tools/setup_RedHat.sh b/tools/setup_RedHat.sh deleted file mode 100755 index a77274a520..0000000000 --- a/tools/setup_RedHat.sh +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/bash - -set -o xtrace -set -o errexit - -function setup_disk { - if [ ! -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=20480 - 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 -export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" - -sudo tee /etc/yum.repos.d/docker.repo << EOF -[docker] -name=Docker Main Repository -baseurl=https://yum.dockerproject.org/repo/main/centos/7 -enabled=1 -gpgcheck=1 -gpgkey=https://yum.dockerproject.org/gpg -EOF - -sudo yum -y install libffi-devel openssl-devel docker-engine docker-engine-selinux btrfs-progs - -setup_disk - -# 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 btrfs --insecure-registry $(cat /etc/nodepool/primary_node_private):4000 -MountFlags=shared -EOF - -sudo systemctl daemon-reload - -sudo systemctl start docker -sudo docker info - -echo "Completed $0."