opendev/system-config
Code Issues Proposed changes

Cleanup devstack-(trusty|precise)-dib images

Browse Source 
Right now we are using dib in hpcloud for devstack-trusty and
devstack-precise, this means we don't need the devstack-trusty-dib and
devstack-precise-dib labels and images to be provided by hpcloud. Remove
as much as we can while retaining the label without providers so that it
is there when we need to test dib images in rackspace.

Depends-On: I91f8d91318752e09a15d64c8b3c506cf83badca2
Change-Id: I7b82fb5162af908a86ffcb291d908a88867f3b06
This commit is contained in:
Clark Boylan 2015-02-24 14:06:06 -08:00
parent 340efe0d91
commit fb0894d71d
1 changed files with 6 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
modules/openstack_project/templates/nodepool/nodepool.yaml.erb
View File

@ -65,26 +65,18 @@ labels:
- name: rax-dfw
- name: rax-ord
- name: rax-iad
# Special dib specific labels for testing dib based images
# in new providers as we dibify them.
- name: devstack-trusty-dib
image: devstack-trusty-dib
ready-script: configure_mirror.sh
min-ready: 1
providers:
- name: hpcloud-b1
- name: hpcloud-b2
- name: hpcloud-b3
- name: hpcloud-b4
- name: hpcloud-b5
min-ready: 0
providers: []
- name: devstack-precise-dib
image: devstack-precise-dib
ready-script: configure_mirror.sh
min-ready: 1
providers:
- name: hpcloud-b1
- name: hpcloud-b2
- name: hpcloud-b3
- name: hpcloud-b4
- name: hpcloud-b5
min-ready: 0
providers: []
- name: bare-trusty
image: bare-trusty
ready-script: configure_mirror.sh
@ -457,11 +449,6 @@ providers:
diskimage: devstack-precise
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- name: devstack-precise-dib
min-ram: 30720
diskimage: devstack-precise-dib
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- name: bare-precise
base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20150127) - Partner Image'
min-ram: 30720
@ -473,11 +460,6 @@ providers:
diskimage: devstack-trusty
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- name: devstack-trusty-dib
min-ram: 30720
diskimage: devstack-trusty-dib
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- name: bare-trusty
base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140927) - Partner Image'
min-ram: 30720
@ -541,11 +523,6 @@ providers:
diskimage: devstack-precise
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- name: devstack-precise-dib
min-ram: 30720
diskimage: devstack-precise-dib
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- name: bare-precise
base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20150127) - Partner Image'
min-ram: 30720
@ -557,11 +534,6 @@ providers:
diskimage: devstack-trusty
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- name: devstack-trusty-dib
min-ram: 30720
diskimage: devstack-trusty-dib
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- name: bare-trusty
base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140927) - Partner Image'
min-ram: 30720
@ -625,11 +597,6 @@ providers:
diskimage: devstack-precise
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- name: devstack-precise-dib
min-ram: 30720
diskimage: devstack-precise-dib
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- name: bare-precise
base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20150127) - Partner Image'
min-ram: 30720
@ -641,11 +608,6 @@ providers:
diskimage: devstack-trusty
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- name: devstack-trusty-dib
min-ram: 30720
diskimage: devstack-trusty-dib
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- name: bare-trusty
base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140927) - Partner Image'
min-ram: 30720
@ -710,11 +672,6 @@ providers:
diskimage: devstack-precise
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- name: devstack-precise-dib
min-ram: 30720
diskimage: devstack-precise-dib
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- name: bare-precise
base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20150127) - Partner Image'
min-ram: 30720
@ -726,11 +683,6 @@ providers:
diskimage: devstack-trusty
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- name: devstack-trusty-dib
min-ram: 30720
diskimage: devstack-trusty-dib
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- name: bare-trusty
base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140927) - Partner Image'
min-ram: 30720
@ -796,11 +748,6 @@ providers:
diskimage: devstack-precise
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- name: devstack-precise-dib
min-ram: 30720
diskimage: devstack-precise-dib
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- name: bare-precise
base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20150127) - Partner Image'
min-ram: 30720
@ -812,11 +759,6 @@ providers:
diskimage: devstack-trusty
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- name: devstack-trusty-dib
min-ram: 30720
diskimage: devstack-trusty-dib
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- name: bare-trusty
base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140927) - Partner Image'
min-ram: 30720
@ -967,19 +909,6 @@ diskimages:
TMPDIR: /opt/dib_tmp
DIB_IMAGE_CACHE: /opt/dib_cache
QEMU_IMG_OPTIONS: compat=0.10
- name: devstack-trusty-dib
elements:
- ubuntu
- vm
- openstack-repos
- puppet
- nodepool-base
- node-devstack
release: trusty
env-vars:
TMPDIR: /opt/dib_tmp
DIB_IMAGE_CACHE: /opt/dib_cache
QEMU_IMG_OPTIONS: compat=0.10
- name: devstack-precise
elements:
- ubuntu
@ -993,19 +922,6 @@ diskimages:
TMPDIR: /opt/dib_tmp
DIB_IMAGE_CACHE: /opt/dib_cache
QEMU_IMG_OPTIONS: compat=0.10
- name: devstack-precise-dib
elements:
- ubuntu
- vm
- openstack-repos
- puppet
- nodepool-base
- node-devstack
release: precise
env-vars:
TMPDIR: /opt/dib_tmp
DIB_IMAGE_CACHE: /opt/dib_cache
QEMU_IMG_OPTIONS: compat=0.10
- name: devstack-centos7-dib
elements:
- centos7