From fa9ba4a3941372ca2c16770764e21148c04d00ad Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Fri, 21 Nov 2014 15:58:23 -0800
Subject: [PATCH] Revert "Initial Fedora 21 nodepool disk-image creation"

This reverts commit 7fab4be0db8233e0225a8f026fabbb80cadff760.

Reverting this because this image does not build and is in a tight loop
of failure.

Logs:
2014-11-21 23:53:14,319 WARNING nodepool.NodePool: Missing disk image devstack-fedora21-dib
2014-11-21 23:53:14,320 DEBUG nodepool.NodePool: Queued image building task for devstack-fedora21-dib
2014-11-21 23:53:14,327 INFO nodepool.DiskImageBuilderThread: Creating image: devstack-fedora21-dib with filename /opt/nodepool_dib/devstack-fedora21-dib-1416613994.qcow2
2014-11-21 23:53:14,340 INFO nodepool.DiskImageBuilderThread: Running disk-image-create -x --no-tmpfs  -o /opt/nodepool_dib/devstack-fedora21-dib-1416613994.qcow2 fedora vm puppet nodepool-base node-devstack
2014-11-21 23:53:14,351 ERROR nodepool.DiskImageBuilderThread: Exception in run method:
Traceback (most recent call last):
  File "/usr/local/lib/python2.7/dist-packages/nodepool/nodepool.py", line 779, in _buildImage
    env=env)
  File "/usr/lib/python2.7/subprocess.py", line 710, in __init__
    errread, errwrite)
  File "/usr/lib/python2.7/subprocess.py", line 1327, in _execute_child
    raise child_exception
TypeError: execve() arg 3 contains a non-string value

Conflicts:
	modules/openstack_project/templates/nodepool/nodepool.yaml.erb

Change-Id: I0d4e8519972d14fc100f46dae1b4549743b438f2
---
 .../templates/nodepool/nodepool.yaml.erb      | 48 -------------------
 1 file changed, 48 deletions(-)

diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
index 5d4d615f79..6aa20438ae 100644
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
@@ -208,16 +208,6 @@ labels:
       - name: hpcloud-b3
       - name: hpcloud-b4
       - name: hpcloud-b5
-  - name: devstack-fedora21-dib
-    image: devstack-fedora21-dib
-    ready-script: configure_mirror.sh
-    min-ready: 0
-    providers:
-      - name: hpcloud-b1
-      - name: hpcloud-b2
-      - name: hpcloud-b3
-      - name: hpcloud-b4
-      - name: hpcloud-b5
   - name: tripleo-precise
     image: tripleo-precise
     min-ready: 8
@@ -586,11 +576,6 @@ providers:
         diskimage: devstack-centos7-dib
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-fedora21-dib
-        min-ram: 30720
-        diskimage: devstack-fedora21-dib
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
       - name: py3k-precise
         base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20140927) - Partner Image'
         min-ram: 30720
@@ -682,11 +667,6 @@ providers:
         diskimage: devstack-centos7-dib
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-fedora21-dib
-        min-ram: 30720
-        diskimage: devstack-fedora21-dib
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
       - name: py3k-precise
         base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20140927) - Partner Image'
         min-ram: 30720
@@ -772,11 +752,6 @@ providers:
         diskimage: devstack-centos7-dib
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-fedora21-dib
-        min-ram: 30720
-        diskimage: devstack-fedora21-dib
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
       - name: bare-f20
         base-image: 'Fedora 20 Server 64-bit 20140407 - Partner Image'
         min-ram: 30720
@@ -875,11 +850,6 @@ providers:
         diskimage: devstack-centos7-dib
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-fedora21-dib
-        min-ram: 30720
-        diskimage: devstack-fedora21-dib
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
       - name: py3k-precise
         base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20140927) - Partner Image'
         min-ram: 30720
@@ -973,11 +943,6 @@ providers:
         diskimage: devstack-centos7-dib
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-fedora21-dib
-        min-ram: 30720
-        diskimage: devstack-fedora21-dib
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
       - name: py3k-precise
         base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20140927) - Partner Image'
         min-ram: 30720
@@ -1121,16 +1086,3 @@ diskimages:
     env-vars:
       TMPDIR: /opt/dib_tmp
       DIB_IMAGE_CACHE: /opt/dib_cache
-  - name: devstack-fedora21-dib
-    elements:
-      - fedora
-      - vm
-      - puppet
-      - nodepool-base
-      - node-devstack
-    release: 21
-    env-vars:
-      TMPDIR: /opt/dib_tmp
-      DIB_IMAGE_CACHE: /opt/dib_cache
-      DIB_CLOUD_IMAGES: http://download.fedoraproject.org/pub/fedora/linux/releases/test/21-Beta/Cloud/Images/x86_64/
-      BASE_IMAGE_FILE: Fedora-Cloud-Base-20141029-21_Beta.x86_64.qcow2