summaryrefslogtreecommitdiff
path: root/tools/setup_RedHat.sh
diff options
context:
space:
mode:
authorDave Walker (Daviey) <email@daviey.com>2016-06-07 10:49:19 +0100
committerDave Walker (Daviey) <email@daviey.com>2016-06-07 11:10:07 +0100
commit334ef7d540fcfe6957b6872cda3f080d0b4b65ab (patch)
tree79209ef897279fcec8865e2b47c12d7e00716f20 /tools/setup_RedHat.sh
parent0ac3719a1709ae50d68b5b8a6722a4b734036d7a (diff)
downloadkolla-334ef7d540fcfe6957b6872cda3f080d0b4b65ab.tar.gz
kolla-334ef7d540fcfe6957b6872cda3f080d0b4b65ab.zip
setup_{RedHat,Debian}.sh, make more idempotent
Previously, when either setup_{RedHat,Debian}.sh was ran multiple times a mess was created due to multiple loop devices being setup. This change now looks to see if '/docker' or '/swapfile' already exist, and not re-create them if they do. *However*, /var/lib/docker (/docker) is still wiped - but it means that the script can run and bring the system into a constant vanilla state. Change-Id: I169662fa04c2bf644672ca75c3ee579795943727 Closes-Bug: #1586563 Signed-off-by: Dave Walker (Daviey) <email@daviey.com>
Diffstat (limited to 'tools/setup_RedHat.sh')
-rwxr-xr-xtools/setup_RedHat.sh24
1 files changed, 14 insertions, 10 deletions
diff --git a/tools/setup_RedHat.sh b/tools/setup_RedHat.sh
index a062768b8..be4b3ec32 100755
--- a/tools/setup_RedHat.sh
+++ b/tools/setup_RedHat.sh
@@ -4,15 +4,19 @@ set -o xtrace
set -o errexit
function setup_disk {
- 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
-
- sudo dd if=/dev/zero of=/docker bs=1M count=20480
- losetup -f /docker
- DEV=$(losetup -a | awk -F: '/\/docker/ {print $1}')
+ 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
+ losetup -f /docker
+ DEV=$(losetup -a | awk -F: '/\/docker/ {print $1}')
+ fi
# Format Disks and setup Docker to use BTRFS
sudo parted ${DEV} -s -- mklabel msdos
@@ -53,7 +57,7 @@ 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 sh -c 'echo "net.ipv6.conf.all.disable_ipv6 = 1" > /etc/sysctl.d/disable_ipv6.conf'
sudo /usr/sbin/sysctl -p
echo "Completed $0."