From 71d84bed47df5be748cad1a0983e51ac350205a2 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Mon, 15 Feb 2016 19:58:12 +0100
Subject: [PATCH] Remove restrict-memory

We do not have HP cloud anymore, remove the restrict-memory files.

Change-Id: I68f8fbd01927ead42e9fab1ff41360f035275d4a
---
 .../finalise.d/99-restrict-memory             | 41 -------------------
 nodepool/scripts/prepare_node_bare.sh         |  2 -
 nodepool/scripts/prepare_node_devstack.sh     |  2 -
 .../prepare_node_devstack_virt_preview.sh     |  2 -
 nodepool/scripts/restrict_memory.sh           | 34 ---------------
 5 files changed, 81 deletions(-)
 delete mode 100755 nodepool/elements/nodepool-base/finalise.d/99-restrict-memory
 delete mode 100755 nodepool/scripts/restrict_memory.sh

diff --git a/nodepool/elements/nodepool-base/finalise.d/99-restrict-memory b/nodepool/elements/nodepool-base/finalise.d/99-restrict-memory
deleted file mode 100755
index cf6443ca61..0000000000
--- a/nodepool/elements/nodepool-base/finalise.d/99-restrict-memory
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash -xe
-# Copyright (C) 2014 Hewlett-Packard Development Company, L.P.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-#
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# This is done in 50 because the vm element has, at 51, an bunch of code
-# for properly handling grub. All we need to do here is get our values
-# in to the files.
-
-# dib-lint: disable=setu setpipefail
-if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
-    set -x
-fi
-set -e
-
-# Limit all test slaves to 8GB of memory so that larger flavors with more
-# cpu resources can be used without the risk of becoming dependent on more
-# memory.
-if [ -f /etc/default/grub ] ; then
-    sed -i -e 's/^GRUB_TIMEOUT=[0-9]\+/GRUB_TIMEOUT=0/' -e 's/#\?GRUB_CMDLINE_LINUX="/GRUB_CMDLINE_LINUX="mem=9023M /g' /etc/default/grub
-    if which update-grub &> /dev/null ; then
-        update-grub
-    else
-        # If update-grub isn't available, use grub2-mkconfig directly
-        /usr/sbin/grub2-mkconfig -o /boot/grub2/grub.cfg
-    fi
-elif [ -f /boot/grub/grub.conf ] ; then
-    sed -i -e 's/^timeout=[0-9]\+/timeout=0/' -e 's/\(^\s\+kernel.*\)/\1 mem=9023M/' /boot/grub/grub.conf
-fi
diff --git a/nodepool/scripts/prepare_node_bare.sh b/nodepool/scripts/prepare_node_bare.sh
index 5caa0a9d91..681e4cb4ad 100755
--- a/nodepool/scripts/prepare_node_bare.sh
+++ b/nodepool/scripts/prepare_node_bare.sh
@@ -23,5 +23,3 @@ export THIN='false'
 export ALL_MYSQL_PRIVS='true'
 
 ./prepare_node.sh "$HOSTNAME"
-
-./restrict_memory.sh
diff --git a/nodepool/scripts/prepare_node_devstack.sh b/nodepool/scripts/prepare_node_devstack.sh
index d48c5e7e9c..3a17952606 100755
--- a/nodepool/scripts/prepare_node_devstack.sh
+++ b/nodepool/scripts/prepare_node_devstack.sh
@@ -40,5 +40,3 @@ sudo chown -R jenkins:jenkins $TEMPEST_DIR/preseed-streams
 
 # Delete the venv after the script is called
 sudo rm -rf /opt/git/subunit2sql-env
-
-./restrict_memory.sh
diff --git a/nodepool/scripts/prepare_node_devstack_virt_preview.sh b/nodepool/scripts/prepare_node_devstack_virt_preview.sh
index 8e9dfe8d47..0315bb307a 100755
--- a/nodepool/scripts/prepare_node_devstack_virt_preview.sh
+++ b/nodepool/scripts/prepare_node_devstack_virt_preview.sh
@@ -24,5 +24,3 @@ export THIN='true'
 ./prepare_node.sh "$HOSTNAME"
 sudo -u jenkins -i /opt/nodepool-scripts/prepare_devstack_virt_preview.sh \
     "$HOSTNAME"
-
-./restrict_memory.sh
diff --git a/nodepool/scripts/restrict_memory.sh b/nodepool/scripts/restrict_memory.sh
deleted file mode 100755
index f5843b7fa0..0000000000
--- a/nodepool/scripts/restrict_memory.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash -xe
-# Copyright (C) 2014 Hewlett-Packard Development Company, L.P.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-#
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Limit all test slaves to 8GB of memory so that larger flavors with more
-# cpu resources can be used without the risk of becoming dependent on more
-# memory.
-if [ -f /etc/default/grub ] ; then
-    sudo sed -i -e 's/^GRUB_TIMEOUT=[0-9]\+/GRUB_TIMEOUT=0/' \
-        -e 's/#\?GRUB_CMDLINE_LINUX="/GRUB_CMDLINE_LINUX="mem=9023M /g' \
-        /etc/default/grub
-    if which update-grub &> /dev/null ; then
-        sudo update-grub
-    else
-        # If update-grub isn't available, use grub2-mkconfig directly
-        sudo /usr/sbin/grub2-mkconfig -o /boot/grub2/grub.cfg
-    fi
-elif [ -f /boot/grub/grub.conf ] ; then
-    sudo sed -i -e 's/^timeout=[0-9]\+/timeout=0/' \
-        -e 's/\(^\s\+kernel.*\)/\1 mem=9023M/' /boot/grub/grub.conf
-fi