From 15806f56f6eba4c89ca6288f13e8e1ddb4e14bdf Mon Sep 17 00:00:00 2001
From: Russell Bryant <rbryant@redhat.com>
Date: Mon, 11 Aug 2014 10:47:06 -0400
Subject: [PATCH] Remove an unused node type

Remove remnants of a node type that is no longer used.  This
originated in revision 8408f96615267ab410063e411468526e90ff8d41 when
we needed an image of 12.04 with a newer kernel.  Revision
2da6d623e0e0af6f9c60fa4e733f02114daca7e7 removed the need for this by
allowing usage of trusty, which is even newer than what this node type
was installing (saucy kernel).

Change-Id: I8787be8369f51c1188d1125190e06f3d3b32f018
---
 .../scripts/prepare_devstack_new_kernel.sh    | 30 -------------------
 .../prepare_node_devstack_new_kernel.sh       | 27 -----------------
 .../templates/nodepool/nodepool.yaml.erb      | 12 --------
 3 files changed, 69 deletions(-)
 delete mode 100755 modules/openstack_project/files/nodepool/scripts/prepare_devstack_new_kernel.sh
 delete mode 100755 modules/openstack_project/files/nodepool/scripts/prepare_node_devstack_new_kernel.sh

diff --git a/modules/openstack_project/files/nodepool/scripts/prepare_devstack_new_kernel.sh b/modules/openstack_project/files/nodepool/scripts/prepare_devstack_new_kernel.sh
deleted file mode 100755
index 601723c7af..0000000000
--- a/modules/openstack_project/files/nodepool/scripts/prepare_devstack_new_kernel.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash -xe
-
-# Copyright (C) 2014 Red Hat, Inc.
-#
-# 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.
-
-if [ -f /usr/bin/apt-get ]; then
-    if [ "$(lsb_release -c -s)" = "precise" ]; then
-        sudo DEBIAN_FRONTEND=noninteractive apt-get \
-          --option "Dpkg::Options::=--force-confold" \
-          --assume-yes install linux-generic-lts-saucy
-    fi
-fi
-
-/opt/nodepool-scripts/prepare_devstack.sh "$@"
-
-sync
-sleep 5
diff --git a/modules/openstack_project/files/nodepool/scripts/prepare_node_devstack_new_kernel.sh b/modules/openstack_project/files/nodepool/scripts/prepare_node_devstack_new_kernel.sh
deleted file mode 100755
index f00cf5ae9d..0000000000
--- a/modules/openstack_project/files/nodepool/scripts/prepare_node_devstack_new_kernel.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash -xe
-
-# Copyright (C) 2011-2013 OpenStack Foundation
-#
-# 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.
-
-HOSTNAME=$1
-
-export SUDO='true'
-export THIN='true'
-
-./prepare_node.sh "$HOSTNAME"
-sudo -u jenkins -i /opt/nodepool-scripts/prepare_devstack_new_kernel.sh "$HOSTNAME"
-
-./restrict_memory.sh
diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
index 46fb591b4e..4e6c8e4401 100644
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
@@ -96,11 +96,6 @@ labels:
       - name: rax-dfw
       - name: rax-ord
       - name: rax-iad
-  - name: dsvm-precise-krnl
-    image: dsvm-precise-krnl
-    min-ready: 0
-    providers:
-      - name: rax-dfw
   - name: devstack-trusty-2-node
     image: devstack-trusty
     ready-script: multinode_setup.sh
@@ -214,13 +209,6 @@ providers:
         setup: prepare_node_py3k.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
-      - name: dsvm-precise-krnl
-        base-image: 'Ubuntu 12.04 LTS (Precise Pangolin)'
-        min-ram: 8192
-        name-filter: 'Performance'
-        setup: prepare_node_devstack_new_kernel.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-f20
         base-image: 'Fedora 20 (Heisenbug) (PVHVM)'
         min-ram: 8192