From ebd8cddd6e0d52ab681624fd09bdb7e7bb936e2e Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 27 Nov 2013 15:39:34 -0800 Subject: [PATCH] Revert "Add Fedora 19 to the nodepool (devstack-f19-check)" This reverts commit 269eb89b84c61b54eaf1890b79ca8a7b54037d43. Revert "Properly escape Schrodinger's Cat in yaml." This reverts commit 21a618adb3ebba0cb1e98fae75d0afdd8f9e9244. Change-Id: I2789ea52bf438bab13062f055092ad49526cd08c --- .../templates/nodepool/nodepool.yaml.erb | 33 ------------------- 1 file changed, 33 deletions(-) diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb index eff7c83260..d7e15c513e 100644 --- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb +++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb @@ -31,13 +31,6 @@ providers: setup: prepare_node_devstack.sh username: jenkins private-key: /home/nodepool/.ssh/id_rsa - - name: devstack-f19-check - base-image: | - Fedora 19 (Schrodinger's Cat) - min-ram: 8192 - setup: prepare_node_devstack.sh - username: jenkins - private-key: /home/nodepool/.ssh/id_rsa - name: rax-ord region-name: 'ORD' service-type: 'compute' @@ -55,13 +48,6 @@ providers: setup: prepare_node_devstack.sh username: jenkins private-key: /home/nodepool/.ssh/id_rsa - - name: devstack-f19-check - base-image: | - Fedora 19 (Schrodinger's Cat) - min-ram: 8192 - setup: prepare_node_devstack.sh - username: jenkins - private-key: /home/nodepool/.ssh/id_rsa - name: rax-iad region-name: 'IAD' service-type: 'compute' @@ -79,13 +65,6 @@ providers: setup: prepare_node_devstack.sh username: jenkins private-key: /home/nodepool/.ssh/id_rsa - - name: devstack-f19-check - base-image: | - Fedora 19 (Schrodinger's Cat) - min-ram: 8192 - setup: prepare_node_devstack.sh - username: jenkins - private-key: /home/nodepool/.ssh/id_rsa - name: hpcloud-az1 region-name: 'az-1.region-a.geo-1' service-type: 'compute' @@ -162,12 +141,6 @@ targets: apikey: '<%= jenkins_api_key %>' credentials-id: '<%= jenkins_credentials_id %>' images: - - name: devstack-f19-check - min-ready: 2 - providers: - - name: rax-iad - - name: rax-dfw - - name: rax-ord - name: devstack-precise min-ready: 20 providers: @@ -191,12 +164,6 @@ targets: apikey: '<%= jenkins_api_key %>' credentials-id: '<%= jenkins_credentials_id %>' images: - - name: devstack-f19-check - min-ready: 2 - providers: - - name: rax-iad - - name: rax-dfw - - name: rax-ord - name: devstack-precise min-ready: 20 providers: