diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-08 16:57:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-08 16:57:50 +0000 |
| commit | 479862932c2db33b789682d2042d0a283abcccd0 (patch) | |
| tree | c88d35b310cf5cdc22bf53cae9f1fb5ac745c2fb | |
| parent | 4204f29e64c366415e8fea4044b2593f119ea9eb (diff) | |
| parent | 334ef7d540fcfe6957b6872cda3f080d0b4b65ab (diff) | |
| download | kolla-479862932c2db33b789682d2042d0a283abcccd0.tar.gz kolla-479862932c2db33b789682d2042d0a283abcccd0.zip | |
Merge "setup_{RedHat,Debian}.sh, make more idempotent"
| -rwxr-xr-x | tools/setup_Debian.sh | 20 | ||||
| -rwxr-xr-x | tools/setup_RedHat.sh | 24 |
2 files changed, 26 insertions, 18 deletions
diff --git a/tools/setup_Debian.sh b/tools/setup_Debian.sh index 0855c89a7..33fa8b16d 100755 --- a/tools/setup_Debian.sh +++ b/tools/setup_Debian.sh @@ -20,15 +20,19 @@ function add_key { } 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 + 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 - sudo dd if=/dev/zero of=/docker bs=1M count=10240 - losetup -f /docker - DEV=$(losetup -a | awk -F: '/\/docker/ {print $1}') + if [ ! -f /docker ]; then + sudo dd if=/dev/zero of=/docker bs=1M count=10240 + 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 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." |