diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-09-21 14:36:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-09-21 14:36:55 +0000 |
| commit | 7b253523125a07663f8566f2d87c5409f55c2e31 (patch) | |
| tree | b858e3de895f9edfe92b034a3e99f9c0f60e862f | |
| parent | 466a34b94dcec189fbc939a9583795b71bab3c75 (diff) | |
| parent | 9748226688c07316933e79eb638d43b71f3005ee (diff) | |
| download | kolla-7b253523125a07663f8566f2d87c5409f55c2e31.tar.gz kolla-7b253523125a07663f8566f2d87c5409f55c2e31.zip | |
Merge "Create swapfile only on nodepool nodes"
| -rwxr-xr-x | tools/setup_Debian.sh | 2 | ||||
| -rwxr-xr-x | tools/setup_RedHat.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/setup_Debian.sh b/tools/setup_Debian.sh index b04369052..f5fd7ed43 100755 --- a/tools/setup_Debian.sh +++ b/tools/setup_Debian.sh @@ -4,7 +4,7 @@ set -o xtrace set -o errexit function setup_disk { - if [ ! -f /swapfile ]; then + 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 diff --git a/tools/setup_RedHat.sh b/tools/setup_RedHat.sh index 3a7345b53..2bd3bb09f 100755 --- a/tools/setup_RedHat.sh +++ b/tools/setup_RedHat.sh @@ -4,7 +4,7 @@ set -o xtrace set -o errexit function setup_disk { - if [ ! -f /swapfile ]; then + 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 |