From 4b0a102647371c07efd1d9981e01d4747a47eac7 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Fri, 22 Apr 2016 19:23:08 -0400
Subject: [PATCH] Remove devstack-centos7 from nodepool

We have no jobs using devstack-centos7 images any more, so we can
remove the images from nodepool.

Change-Id: I458bca80e45ae91099dd07bc38cfbf22174d36dd
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 nodepool/nodepool.yaml | 86 ------------------------------------------
 1 file changed, 86 deletions(-)

diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml
index 11ea4d0e60..ac36bee85a 100644
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@@ -85,17 +85,6 @@ labels:
       - name: internap-nyj01
       - name: vexxhost-ca-ymq-1
       - name: osic-cloud1
-  - name: devstack-centos7
-    image: devstack-centos7
-    ready-script: configure_mirror.sh
-    min-ready: -1
-    providers:
-      - name: ovh-gra1
-      - name: ovh-bhs1
-      - name: bluebox-sjc1
-      - name: internap-nyj01
-      - name: vexxhost-ca-ymq-1
-      - name: osic-cloud1
   - name: centos-7
     image: centos-7
     ready-script: configure_mirror.sh
@@ -196,13 +185,6 @@ providers:
         meta:
           vm_mode: hvm
           xenapi_use_agent: 'false'
-      - name: devstack-centos7
-        base-image: 'CentOS 7 (PVHVM)'
-        min-ram: 8192
-        name-filter: 'Performance'
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
   - name: rax-ord
     region-name: 'ORD'
     cloud: rax
@@ -269,13 +251,6 @@ providers:
         meta:
           vm_mode: hvm
           xenapi_use_agent: 'false'
-      - name: devstack-centos7
-        base-image: 'CentOS 7 (PVHVM)'
-        min-ram: 8192
-        name-filter: 'Performance'
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
   - name: rax-iad
     region-name: 'IAD'
     cloud: rax
@@ -342,13 +317,6 @@ providers:
         meta:
           vm_mode: hvm
           xenapi_use_agent: 'false'
-      - name: devstack-centos7
-        base-image: 'CentOS 7 (PVHVM)'
-        min-ram: 8192
-        name-filter: 'Performance'
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
   - name: ovh-gra1
     region-name: 'GRA1'
     cloud: ovh
@@ -379,13 +347,6 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
         config-drive: true
-      - name: devstack-centos7
-        min-ram: 8000
-        name-filter: 'ssd-osFoundation-3'
-        diskimage: devstack-centos7
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
       - name: fedora-23
         min-ram: 8000
         name-filter: 'ssd-osFoundation-3'
@@ -430,13 +391,6 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
         config-drive: true
-      - name: devstack-centos7
-        min-ram: 8000
-        name-filter: 'ssd-osFoundation-3'
-        diskimage: devstack-centos7
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
       - name: fedora-23
         min-ram: 8000
         name-filter: 'ssd-osFoundation-3'
@@ -481,13 +435,6 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
         config-drive: true
-      - name: devstack-centos7
-        min-ram: 8000
-        name-filter: 'nodepool'
-        diskimage: devstack-centos7
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
       - name: fedora-23
         min-ram: 8000
         name-filter: 'nodepool'
@@ -533,13 +480,6 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
         config-drive: true
-      - name: devstack-centos7
-        min-ram: 8000
-        name-filter: 'A1.8'
-        diskimage: devstack-centos7
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
       - name: fedora-23
         min-ram: 8000
         name-filter: 'A1.8'
@@ -580,12 +520,6 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
         config-drive: true
-      - name: devstack-centos7
-        min-ram: 8000
-        diskimage: devstack-centos7
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
       - name: fedora-23
         min-ram: 8000
         diskimage: fedora-23
@@ -628,13 +562,6 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
         config-drive: true
-      - name: devstack-centos7
-        min-ram: 8000
-        name-filter: 'm2.medium'
-        diskimage: devstack-centos7
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
       - name: fedora-23
         min-ram: 8000
         name-filter: 'm2.medium'
@@ -727,19 +654,6 @@ diskimages:
       DIB_IMAGE_CACHE: /opt/dib_cache
       DIB_APT_LOCAL_CACHE: '0'
       DIB_DISABLE_APT_CLEANUP: '1'
-  - name: devstack-centos7
-    elements:
-      - centos7
-      - vm
-      - openstack-repos
-      - nodepool-base
-      - node-devstack
-      - cache-bindep
-      - infra-package-needs
-    env-vars:
-      TMPDIR: /opt/dib_tmp
-      DIB_IMAGE_CACHE: /opt/dib_cache
-      QEMU_IMG_OPTIONS: compat=0.10
   - name: centos-7
     elements:
       - centos-minimal