diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb index 0a89c065db..abf27dd8d6 100644 --- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb +++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb @@ -177,14 +177,6 @@ labels: - name: hpcloud-b3 - name: hpcloud-b4 - name: hpcloud-b5 - - name: devstack-f20-virt-preview - image: devstack-f20-virt-preview - ready-script: configure_mirror.sh - min-ready: 0 - providers: - - name: rax-dfw - - name: rax-ord - - name: rax-iad - name: devstack-centos7 image: devstack-centos7 ready-script: configure_mirror.sh @@ -288,13 +280,6 @@ providers: setup: prepare_node_bare.sh username: jenkins private-key: /home/nodepool/.ssh/id_rsa - - name: devstack-f20-virt-preview - base-image: 'Fedora 20 (Heisenbug) (PVHVM)' - min-ram: 8192 - name-filter: 'Performance' - setup: prepare_node_devstack_virt_preview.sh - username: jenkins - private-key: /home/nodepool/.ssh/id_rsa - name: devstack-centos7 base-image: 'CentOS 7 (PVHVM)' min-ram: 8192 @@ -370,13 +355,6 @@ providers: setup: prepare_node_bare.sh username: jenkins private-key: /home/nodepool/.ssh/id_rsa - - name: devstack-f20-virt-preview - base-image: 'Fedora 20 (Heisenbug) (PVHVM)' - min-ram: 8192 - name-filter: 'Performance' - setup: prepare_node_devstack_virt_preview.sh - username: jenkins - private-key: /home/nodepool/.ssh/id_rsa - name: devstack-centos7 base-image: 'CentOS 7 (PVHVM)' min-ram: 8192 @@ -459,13 +437,6 @@ providers: setup: prepare_node_bare.sh username: jenkins private-key: /home/nodepool/.ssh/id_rsa - - name: devstack-f20-virt-preview - base-image: 'Fedora 20 (Heisenbug) (PVHVM)' - min-ram: 8192 - name-filter: 'Performance' - setup: prepare_node_devstack_virt_preview.sh - username: jenkins - private-key: /home/nodepool/.ssh/id_rsa - name: devstack-centos7 base-image: 'CentOS 7 (PVHVM)' min-ram: 8192