From 1fdd6945d653c3778e257fb158731eb9d91faece Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Thu, 10 Jan 2019 10:04:23 +1100
Subject: [PATCH] Revert "Add CentOS NetworkManager testing node"

This reverts commit 32e63aa0c8d1ac60558b09233d2d791bd4ce1c3a (and
small follow-on fix 0eeb4395d1ccac19dea0d6688d4b5712a370b89c)

The base CentOS node is switched to NetworkManager support

Change-Id: Ic254273afdf0637194b608b781ea9e3ff4bd73a3
---
 nodepool/nl01.openstack.org.yaml | 10 ----------
 nodepool/nl02.openstack.org.yaml | 19 -------------------
 nodepool/nl03.openstack.org.yaml | 14 --------------
 nodepool/nl04.openstack.org.yaml | 11 -----------
 nodepool/nodepool.yaml           | 24 ------------------------
 5 files changed, 78 deletions(-)

diff --git a/nodepool/nl01.openstack.org.yaml b/nodepool/nl01.openstack.org.yaml
index 710be938eb..2d5fd8e834 100644
--- a/nodepool/nl01.openstack.org.yaml
+++ b/nodepool/nl01.openstack.org.yaml
@@ -15,8 +15,6 @@ zookeeper-servers:
 labels:
   - name: centos-7
     min-ready: 1
-  - name: centos-7-nm
-    min-ready: 1
   - name: debian-stretch
     min-ready: 1
   - name: fedora-28
@@ -48,8 +46,6 @@ providers:
     diskimages: &provider_diskimages
       - name: centos-7
         config-drive: true
-      - name: centos-7-nm
-        config-drive: true
       - name: debian-stretch
         config-drive: true
       - name: fedora-28
@@ -79,11 +75,6 @@ providers:
             flavor-name: 'Performance'
             diskimage: centos-7
             key-name: infra-root-keys-2018-06-15
-          - name: centos-7-nm
-            min-ram: 8192
-            flavor-name: 'Performance'
-            diskimage: centos-7-nm
-            key-name: infra-root-keys-2018-06-15
           - name: debian-stretch
             min-ram: 8000
             flavor-name: 'Performance'
@@ -162,7 +153,6 @@ providers:
 
 diskimages:
   - name: centos-7
-  - name: centos-7-nm
   - name: debian-stretch
   - name: fedora-28
   - name: fedora-29
diff --git a/nodepool/nl02.openstack.org.yaml b/nodepool/nl02.openstack.org.yaml
index 0fbd2b54a1..af08c9d517 100644
--- a/nodepool/nl02.openstack.org.yaml
+++ b/nodepool/nl02.openstack.org.yaml
@@ -14,7 +14,6 @@ zookeeper-servers:
 # another launcher will need to assume this logic.
 labels:
   - name: centos-7
-  - name: centos-7-nm
   - name: debian-stretch
   - name: fedora-28
   - name: fedora-29
@@ -37,8 +36,6 @@ providers:
     diskimages: &provider_diskimages
       - name: centos-7
         config-drive: true
-      - name: centos-7-nm
-        config-drive: true
       - name: debian-stretch
         config-drive: true
       - name: fedora-28
@@ -72,11 +69,6 @@ providers:
             flavor-name: '8C-8GB-100GB'
             diskimage: centos-7
             key-name: infra-root-keys-2018-06-15
-          - name: centos-7-nm
-            min-ram: 8000
-            flavor-name: '8C-8GB-100GB'
-            diskimage: centos-7-nm
-            key-name: infra-root-keys-2018-06-15
           - name: debian-stretch
             min-ram: 8000
             flavor-name: '8C-8GB-100GB'
@@ -195,11 +187,6 @@ providers:
             flavor-name: 'nodepool.0'
             diskimage: centos-7
             key-name: infra-root-keys-2018-06-15
-          - name: centos-7-nm
-            min-ram: 8000
-            flavor-name: 'nodepool.0'
-            diskimage: centos-7-nm
-            key-name: infra-root-keys-2018-06-15
           - name: debian-stretch
             min-ram: 8000
             flavor-name: 'nodepool.0'
@@ -268,11 +255,6 @@ providers:
             flavor-name: 'zuul-flavor'
             diskimage: centos-7
             key-name: infra-root-keys-2018-06-15
-          - name: centos-7-nm
-            min-ram: 8000
-            flavor-name: 'zuul-flavor'
-            diskimage: centos-7-nm
-            key-name: infra-root-keys-2018-06-15
           - name: debian-stretch
             min-ram: 8000
             flavor-name: 'zuul-flavor'
@@ -326,7 +308,6 @@ providers:
 
 diskimages:
   - name: centos-7
-  - name: centos-7-nm
   - name: debian-stretch
   - name: fedora-28
   - name: fedora-29
diff --git a/nodepool/nl03.openstack.org.yaml b/nodepool/nl03.openstack.org.yaml
index f82819c33d..46a12e5b01 100644
--- a/nodepool/nl03.openstack.org.yaml
+++ b/nodepool/nl03.openstack.org.yaml
@@ -17,7 +17,6 @@ zookeeper-servers:
 # ubuntu-xenial-arm64 being one of them.
 labels:
   - name: centos-7
-  - name: centos-7-nm
   - name: debian-stretch
   - name: debian-stretch-arm64
     min-ready: 1
@@ -154,11 +153,6 @@ providers:
             flavor-name: 'osf-highcpu-8'
             diskimage: centos-7
             key-name: infra-root-keys-2018-06-15
-          - name: centos-7-nm
-            min-ram: 8000
-            flavor-name: 'osf-highcpu-8'
-            diskimage: centos-7-nm
-            key-name: infra-root-keys-2018-06-15
           - name: debian-stretch
             min-ram: 8000
             flavor-name: 'osf-highcpu-8'
@@ -245,13 +239,6 @@ providers:
             volume-size: 80
             diskimage: centos-7
             key-name: infra-root-keys-2018-06-15
-          - name: centos-7-nm
-            min-ram: 8000
-            flavor-name: v2-highcpu-8
-            boot-from-volume: true
-            volume-size: 80
-            diskimage: centos-7-nm
-            key-name: infra-root-keys-2018-06-15
           - name: debian-stretch
             min-ram: 8000
             flavor-name: v2-highcpu-8
@@ -455,7 +442,6 @@ providers:
 
 diskimages:
   - name: centos-7
-  - name: centos-7-nm
   - name: debian-stretch
   - name: debian-stretch-arm64
   - name: fedora-28
diff --git a/nodepool/nl04.openstack.org.yaml b/nodepool/nl04.openstack.org.yaml
index af05a465be..481761c529 100644
--- a/nodepool/nl04.openstack.org.yaml
+++ b/nodepool/nl04.openstack.org.yaml
@@ -14,7 +14,6 @@ zookeeper-servers:
 # another launcher will need to assume this logic.
 labels:
   - name: centos-7
-  - name: centos-7-nm
   - name: debian-stretch
   - name: fedora-28
   - name: fedora-29
@@ -36,8 +35,6 @@ providers:
     diskimages: &provider_diskimages
       - name: centos-7
         config-drive: true
-      - name: centos-7-nm
-        config-drive: true
       - name: debian-stretch
         config-drive: true
       - name: fedora-28
@@ -69,13 +66,6 @@ providers:
             key-name: infra-root-keys-2018-06-15
             instance-properties:
               glean_ignore_interfaces: 'True'
-          - name: centos-7-nm
-            min-ram: 8000
-            flavor-name: ssd-osFoundation-3
-            diskimage: centos-7-nm
-            key-name: infra-root-keys-2018-06-15
-            instance-properties:
-              glean_ignore_interfaces: 'True'
           - name: debian-stretch
             min-ram: 8000
             flavor-name: ssd-osFoundation-3
@@ -161,7 +151,6 @@ providers:
 
 diskimages:
   - name: centos-7
-  - name: centos-7-nm
   - name: debian-stretch
   - name: fedora-28
   - name: fedora-29
diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml
index 0131ffa9cd..9333e0d68e 100644
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@@ -43,8 +43,6 @@ providers:
     diskimages: &provider_diskimages
       - name: centos-7
         config-drive: true
-      - name: centos-7-nm
-        config-drive: true
       - name: debian-stretch
         config-drive: true
       - name: fedora-28
@@ -122,28 +120,6 @@ providers:
 
 diskimages:
   - name: centos-7
-    pause: false
-    elements:
-      - centos-minimal
-      - vm
-      - simple-init
-      - openstack-repos
-      - nodepool-base
-      - cache-devstack
-      - growroot
-      - infra-package-needs
-      - epel
-    env-vars:
-      TMPDIR: /opt/dib_tmp
-      DIB_CHECKSUM: '1'
-      DIB_IMAGE_CACHE: /opt/dib_cache
-      QEMU_IMG_OPTIONS: compat=0.10
-      DIB_GRUB_TIMEOUT: '0'
-      DIB_EPEL_DISABLED: '1'
-      GIT_HTTP_LOW_SPEED_TIME: '300'
-      GIT_HTTP_LOW_SPEED_LIMIT: '1000'
-  # Temporary node to test NetworkManager based boots
-  - name: centos-7-nm
     pause: false
     elements:
       - centos-minimal