Add ubuntu-trusty images to rax

We are using shade to upload dib images now which means we can upload
images built with glean to rackspace and expect them to work as long as
they have config drives attached. Update nodepool's config to host
ubuntu-trusty nodes in rackspace using the shade image upload feature.

Change-Id: I6604cdb2b20225cb9b17474a490ddebc7813cc03
This commit is contained in:
Clark Boylan 2015-05-26 09:45:11 -07:00 committed by Jeremy Stanley
parent 4c8b6c8f51
commit 3e5d02828b
2 changed files with 59 additions and 2 deletions

View File

@ -6,10 +6,10 @@
# #
[loggers] [loggers]
keys=root,nodepool,requests,image,rax-dfw_devstack-precise,rax-dfw_bare-precise,rax-dfw_devstack-trusty,rax-dfw_bare-trusty,rax-dfw_bare-centos6,rax-dfw_centos-6,rax-dfw_devstack-f21,rax-dfw_devstack-centos7,rax-ord_devstack-precise,rax-ord_bare-precise,rax-ord_devstack-trusty,rax-ord_bare-trusty,rax-ord_bare-centos6,rax-ord_centos-6,rax-ord_devstack-f21,rax-ord_devstack-centos7,rax-iad_devstack-precise,rax-iad_bare-precise,rax-iad_devstack-trusty,rax-iad_bare-trusty,rax-iad_bare-centos6,rax-iad_centos-6,rax-iad_devstack-precise-check,rax-iad_devstack-f21,rax-iad_devstack-centos7,hpcloud-region-a_devstack-precise-check,hpcloud-b1_devstack-precise-check,hpcloud-b1_devstack-precise,hpcloud-b1_bare-precise,hpcloud-b1_devstack-trusty,hpcloud-b1_bare-trusty,hpcloud-b1_bare-centos6,hpcloud-b1_centos-6,hpcloud-b1_ubuntu-trusty,hpcloud-b1_devstack-f21,hpcloud-b1_devstack-centos7,hpcloud-b1_devstack-centos7-dib,hpcloud-b1_devstack-fedora21-dib,hpcloud-b2_devstack-precise-check,hpcloud-b2_devstack-precise,hpcloud-b2_bare-precise,hpcloud-b2_devstack-trusty,hpcloud-b2_bare-trusty,hpcloud-b2_bare-centos6,hpcloud-b2_centos-6,hpcloud-b2_ubuntu-trusty,hpcloud-b2_devstack-f21,hpcloud-b2_devstack-centos7,hpcloud-b2_devstack-centos7-dib,hpcloud-b2_devstack-fedora21-dib,hpcloud-b3_devstack-precise-check,hpcloud-b3_devstack-precise,hpcloud-b3_bare-precise,hpcloud-b3_devstack-trusty,hpcloud-b3_bare-trusty,hpcloud-b3_bare-centos6,hpcloud-b3_centos-6,hpcloud-b3_ubuntu-trusty,hpcloud-b3_devstack-f21,hpcloud-b3_devstack-centos7,hpcloud-b3_devstack-centos7-dib,hpcloud-b3_devstack-fedora21-dib,hpcloud-b4_devstack-precise-check,hpcloud-b4_devstack-precise,hpcloud-b4_bare-precise,hpcloud-b4_devstack-trusty,hpcloud-b4_bare-trusty,hpcloud-b4_bare-centos6,hpcloud-b4_centos-6,hpcloud-b4_ubuntu-trusty,hpcloud-b4_devstack-f21,hpcloud-b4_devstack-centos7,hpcloud-b4_devstack-centos7-dib,hpcloud-b4_devstack-fedora21-dib,hpcloud-b5_devstack-precise-check,hpcloud-b5_devstack-precise,hpcloud-b5_bare-precise,hpcloud-b5_devstack-trusty,hpcloud-b5_bare-trusty,hpcloud-b5_bare-centos6,hpcloud-b5_centos-6,hpcloud-b5_ubuntu-trusty,hpcloud-b5_devstack-f21,hpcloud-b5_devstack-centos7,hpcloud-b5_devstack-centos7-dib,hpcloud-b5_devstack-fedora21-dib,tripleo-test-cloud-rh1_tripleo-precise,tripleo-test-cloud-rh1_tripleo-f20,tripleo-test-cloud-rh1_tripleo-f21,dib_centos-6,dib_ubuntu-trusty,dib_devstack-trusty,dib_devstack-precise,dib_devstack-centos7-dib,dib_devstack-fedora21-dib keys=root,nodepool,requests,image,rax-dfw_devstack-precise,rax-dfw_bare-precise,rax-dfw_devstack-trusty,rax-dfw_bare-trusty,rax-dfw_bare-centos6,rax-dfw_centos-6,rax-dfw_ubuntu-trusty,rax-dfw_devstack-f21,rax-dfw_devstack-centos7,rax-ord_devstack-precise,rax-ord_bare-precise,rax-ord_devstack-trusty,rax-ord_bare-trusty,rax-ord_bare-centos6,rax-ord_centos-6,rax-ord_ubuntu-trusty,rax-ord_devstack-f21,rax-ord_devstack-centos7,rax-iad_devstack-precise,rax-iad_bare-precise,rax-iad_devstack-trusty,rax-iad_bare-trusty,rax-iad_bare-centos6,rax-iad_centos-6,rax-iad_ubuntu-trusty,rax-iad_devstack-precise-check,rax-iad_devstack-f21,rax-iad_devstack-centos7,hpcloud-region-a_devstack-precise-check,hpcloud-b1_devstack-precise-check,hpcloud-b1_devstack-precise,hpcloud-b1_bare-precise,hpcloud-b1_devstack-trusty,hpcloud-b1_bare-trusty,hpcloud-b1_bare-centos6,hpcloud-b1_centos-6,hpcloud-b1_ubuntu-trusty,hpcloud-b1_devstack-f21,hpcloud-b1_devstack-centos7,hpcloud-b1_devstack-centos7-dib,hpcloud-b1_devstack-fedora21-dib,hpcloud-b2_devstack-precise-check,hpcloud-b2_devstack-precise,hpcloud-b2_bare-precise,hpcloud-b2_devstack-trusty,hpcloud-b2_bare-trusty,hpcloud-b2_bare-centos6,hpcloud-b2_centos-6,hpcloud-b2_ubuntu-trusty,hpcloud-b2_devstack-f21,hpcloud-b2_devstack-centos7,hpcloud-b2_devstack-centos7-dib,hpcloud-b2_devstack-fedora21-dib,hpcloud-b3_devstack-precise-check,hpcloud-b3_devstack-precise,hpcloud-b3_bare-precise,hpcloud-b3_devstack-trusty,hpcloud-b3_bare-trusty,hpcloud-b3_bare-centos6,hpcloud-b3_centos-6,hpcloud-b3_ubuntu-trusty,hpcloud-b3_devstack-f21,hpcloud-b3_devstack-centos7,hpcloud-b3_devstack-centos7-dib,hpcloud-b3_devstack-fedora21-dib,hpcloud-b4_devstack-precise-check,hpcloud-b4_devstack-precise,hpcloud-b4_bare-precise,hpcloud-b4_devstack-trusty,hpcloud-b4_bare-trusty,hpcloud-b4_bare-centos6,hpcloud-b4_centos-6,hpcloud-b4_ubuntu-trusty,hpcloud-b4_devstack-f21,hpcloud-b4_devstack-centos7,hpcloud-b4_devstack-centos7-dib,hpcloud-b4_devstack-fedora21-dib,hpcloud-b5_devstack-precise-check,hpcloud-b5_devstack-precise,hpcloud-b5_bare-precise,hpcloud-b5_devstack-trusty,hpcloud-b5_bare-trusty,hpcloud-b5_bare-centos6,hpcloud-b5_centos-6,hpcloud-b5_ubuntu-trusty,hpcloud-b5_devstack-f21,hpcloud-b5_devstack-centos7,hpcloud-b5_devstack-centos7-dib,hpcloud-b5_devstack-fedora21-dib,tripleo-test-cloud-rh1_tripleo-precise,tripleo-test-cloud-rh1_tripleo-f20,tripleo-test-cloud-rh1_tripleo-f21,dib_centos-6,dib_ubuntu-trusty,dib_devstack-trusty,dib_devstack-precise,dib_devstack-centos7-dib,dib_devstack-fedora21-dib
[handlers] [handlers]
keys=console,debug,normal,image,rax-dfw_devstack-precise,rax-dfw_bare-precise,rax-dfw_devstack-trusty,rax-dfw_bare-trusty,rax-dfw_bare-centos6,rax-dfw_centos-6,rax-dfw_devstack-f21,rax-dfw_devstack-centos7,rax-ord_devstack-precise,rax-ord_bare-precise,rax-ord_devstack-trusty,rax-ord_bare-trusty,rax-ord_bare-centos6,rax-ord_centos-6,rax-ord_devstack-f21,rax-ord_devstack-centos7,rax-iad_devstack-precise,rax-iad_bare-precise,rax-iad_devstack-trusty,rax-iad_bare-trusty,rax-iad_bare-centos6,rax-iad_centos-6,rax-iad_devstack-precise-check,rax-iad_devstack-f21,rax-iad_devstack-centos7,hpcloud-region-a_devstack-precise-check,hpcloud-b1_devstack-precise-check,hpcloud-b1_devstack-precise,hpcloud-b1_bare-precise,hpcloud-b1_devstack-trusty,hpcloud-b1_bare-trusty,hpcloud-b1_bare-centos6,hpcloud-b1_centos-6,hpcloud-b1_ubuntu-trusty,hpcloud-b1_devstack-f21,hpcloud-b1_devstack-centos7,hpcloud-b1_devstack-centos7-dib,hpcloud-b1_devstack-fedora21-dib,hpcloud-b2_devstack-precise-check,hpcloud-b2_devstack-precise,hpcloud-b2_bare-precise,hpcloud-b2_devstack-trusty,hpcloud-b2_bare-trusty,hpcloud-b2_bare-centos6,hpcloud-b2_centos-6,hpcloud-b2_ubuntu-trusty,hpcloud-b2_devstack-f21,hpcloud-b2_devstack-centos7,hpcloud-b2_devstack-centos7-dib,hpcloud-b2_devstack-fedora21-dib,hpcloud-b3_devstack-precise-check,hpcloud-b3_devstack-precise,hpcloud-b3_bare-precise,hpcloud-b3_devstack-trusty,hpcloud-b3_bare-trusty,hpcloud-b3_bare-centos6,hpcloud-b3_centos-6,hpcloud-b3_ubuntu-trusty,hpcloud-b3_devstack-f21,hpcloud-b3_devstack-centos7,hpcloud-b3_devstack-centos7-dib,hpcloud-b3_devstack-fedora21-dib,hpcloud-b4_devstack-precise-check,hpcloud-b4_devstack-precise,hpcloud-b4_bare-precise,hpcloud-b4_devstack-trusty,hpcloud-b4_bare-trusty,hpcloud-b4_bare-centos6,hpcloud-b4_centos-6,hpcloud-b4_ubuntu-trusty,hpcloud-b4_devstack-f21,hpcloud-b4_devstack-centos7,hpcloud-b4_devstack-centos7-dib,hpcloud-b4_devstack-fedora21-dib,hpcloud-b5_devstack-precise-check,hpcloud-b5_devstack-precise,hpcloud-b5_bare-precise,hpcloud-b5_devstack-trusty,hpcloud-b5_bare-trusty,hpcloud-b5_bare-centos6,hpcloud-b5_centos-6,hpcloud-b5_ubuntu-trusty,hpcloud-b5_devstack-f21,hpcloud-b5_devstack-centos7,hpcloud-b5_devstack-centos7-dib,hpcloud-b5_devstack-fedora21-dib,tripleo-test-cloud-rh1_tripleo-precise,tripleo-test-cloud-rh1_tripleo-f20,tripleo-test-cloud-rh1_tripleo-f21,dib_centos-6,dib_ubuntu-trusty,dib_devstack-trusty,dib_devstack-precise,dib_devstack-centos7-dib,dib_devstack-fedora21-dib keys=console,debug,normal,image,rax-dfw_devstack-precise,rax-dfw_bare-precise,rax-dfw_devstack-trusty,rax-dfw_bare-trusty,rax-dfw_bare-centos6,rax-dfw_centos-6,rax-dfw_ubuntu-trusty,rax-dfw_devstack-f21,rax-dfw_devstack-centos7,rax-ord_devstack-precise,rax-ord_bare-precise,rax-ord_devstack-trusty,rax-ord_bare-trusty,rax-ord_bare-centos6,rax-ord_centos-6,rax-ord_ubuntu-trusty,rax-ord_devstack-f21,rax-ord_devstack-centos7,rax-iad_devstack-precise,rax-iad_bare-precise,rax-iad_devstack-trusty,rax-iad_bare-trusty,rax-iad_bare-centos6,rax-iad_centos-6,rax-iad_ubuntu-trusty,rax-iad_devstack-precise-check,rax-iad_devstack-f21,rax-iad_devstack-centos7,hpcloud-region-a_devstack-precise-check,hpcloud-b1_devstack-precise-check,hpcloud-b1_devstack-precise,hpcloud-b1_bare-precise,hpcloud-b1_devstack-trusty,hpcloud-b1_bare-trusty,hpcloud-b1_bare-centos6,hpcloud-b1_centos-6,hpcloud-b1_ubuntu-trusty,hpcloud-b1_devstack-f21,hpcloud-b1_devstack-centos7,hpcloud-b1_devstack-centos7-dib,hpcloud-b1_devstack-fedora21-dib,hpcloud-b2_devstack-precise-check,hpcloud-b2_devstack-precise,hpcloud-b2_bare-precise,hpcloud-b2_devstack-trusty,hpcloud-b2_bare-trusty,hpcloud-b2_bare-centos6,hpcloud-b2_centos-6,hpcloud-b2_ubuntu-trusty,hpcloud-b2_devstack-f21,hpcloud-b2_devstack-centos7,hpcloud-b2_devstack-centos7-dib,hpcloud-b2_devstack-fedora21-dib,hpcloud-b3_devstack-precise-check,hpcloud-b3_devstack-precise,hpcloud-b3_bare-precise,hpcloud-b3_devstack-trusty,hpcloud-b3_bare-trusty,hpcloud-b3_bare-centos6,hpcloud-b3_centos-6,hpcloud-b3_ubuntu-trusty,hpcloud-b3_devstack-f21,hpcloud-b3_devstack-centos7,hpcloud-b3_devstack-centos7-dib,hpcloud-b3_devstack-fedora21-dib,hpcloud-b4_devstack-precise-check,hpcloud-b4_devstack-precise,hpcloud-b4_bare-precise,hpcloud-b4_devstack-trusty,hpcloud-b4_bare-trusty,hpcloud-b4_bare-centos6,hpcloud-b4_centos-6,hpcloud-b4_ubuntu-trusty,hpcloud-b4_devstack-f21,hpcloud-b4_devstack-centos7,hpcloud-b4_devstack-centos7-dib,hpcloud-b4_devstack-fedora21-dib,hpcloud-b5_devstack-precise-check,hpcloud-b5_devstack-precise,hpcloud-b5_bare-precise,hpcloud-b5_devstack-trusty,hpcloud-b5_bare-trusty,hpcloud-b5_bare-centos6,hpcloud-b5_centos-6,hpcloud-b5_ubuntu-trusty,hpcloud-b5_devstack-f21,hpcloud-b5_devstack-centos7,hpcloud-b5_devstack-centos7-dib,hpcloud-b5_devstack-fedora21-dib,tripleo-test-cloud-rh1_tripleo-precise,tripleo-test-cloud-rh1_tripleo-f20,tripleo-test-cloud-rh1_tripleo-f21,dib_centos-6,dib_ubuntu-trusty,dib_devstack-trusty,dib_devstack-precise,dib_devstack-centos7-dib,dib_devstack-fedora21-dib
[formatters] [formatters]
keys=simple keys=simple
@ -137,6 +137,18 @@ class=logging.handlers.TimedRotatingFileHandler
formatter=simple formatter=simple
args=('<%= @image_log_document_root %>/rax-dfw.centos-6.log', 'H', 8, 30,) args=('<%= @image_log_document_root %>/rax-dfw.centos-6.log', 'H', 8, 30,)
[logger_rax-dfw_ubuntu-trusty]
level=INFO
handlers=rax-dfw_ubuntu-trusty
qualname=nodepool.image.build.rax-dfw.ubuntu-trusty
propagate=0
[handler_rax-dfw_ubuntu-trusty]
level=INFO
class=logging.handlers.TimedRotatingFileHandler
formatter=simple
args=('<%= @image_log_document_root %>/rax-dfw.ubuntu-trusty.log', 'H', 8, 30,)
[logger_rax-dfw_devstack-f21] [logger_rax-dfw_devstack-f21]
level=INFO level=INFO
handlers=rax-dfw_devstack-f21 handlers=rax-dfw_devstack-f21
@ -233,6 +245,18 @@ class=logging.handlers.TimedRotatingFileHandler
formatter=simple formatter=simple
args=('<%= @image_log_document_root %>/rax-ord.centos-6.log', 'H', 8, 30,) args=('<%= @image_log_document_root %>/rax-ord.centos-6.log', 'H', 8, 30,)
[logger_rax-ord_ubuntu-trusty]
level=INFO
handlers=rax-ord_ubuntu-trusty
qualname=nodepool.image.build.rax-ord.ubuntu-trusty
propagate=0
[handler_rax-ord_ubuntu-trusty]
level=INFO
class=logging.handlers.TimedRotatingFileHandler
formatter=simple
args=('<%= @image_log_document_root %>/rax-ord.ubuntu-trusty.log', 'H', 8, 30,)
[logger_rax-ord_devstack-f21] [logger_rax-ord_devstack-f21]
level=INFO level=INFO
handlers=rax-ord_devstack-f21 handlers=rax-ord_devstack-f21
@ -329,6 +353,18 @@ class=logging.handlers.TimedRotatingFileHandler
formatter=simple formatter=simple
args=('<%= @image_log_document_root %>/rax-iad.centos-6.log', 'H', 8, 30,) args=('<%= @image_log_document_root %>/rax-iad.centos-6.log', 'H', 8, 30,)
[logger_rax-iad_ubuntu-trusty]
level=INFO
handlers=rax-iad_ubuntu-trusty
qualname=nodepool.image.build.rax-iad.ubuntu-trusty
propagate=0
[handler_rax-iad_ubuntu-trusty]
level=INFO
class=logging.handlers.TimedRotatingFileHandler
formatter=simple
args=('<%= @image_log_document_root %>/rax-iad.ubuntu-trusty.log', 'H', 8, 30,)
[logger_rax-iad_devstack-precise-check] [logger_rax-iad_devstack-precise-check]
level=INFO level=INFO
handlers=rax-iad_devstack-precise-check handlers=rax-iad_devstack-precise-check

View File

@ -126,6 +126,9 @@ labels:
- name: hpcloud-b3 - name: hpcloud-b3
- name: hpcloud-b4 - name: hpcloud-b4
- name: hpcloud-b5 - name: hpcloud-b5
- name: rax-dfw
- name: rax-ord
- name: rax-iad
- name: devstack-trusty-2-node - name: devstack-trusty-2-node
image: devstack-trusty image: devstack-trusty
ready-script: multinode_setup.sh ready-script: multinode_setup.sh
@ -272,6 +275,12 @@ providers:
setup: prepare_node_devstack.sh setup: prepare_node_devstack.sh
username: jenkins username: jenkins
private-key: /home/nodepool/.ssh/id_rsa private-key: /home/nodepool/.ssh/id_rsa
- name: ubuntu-trusty
min-ram: 8192
diskimage: ubuntu-trusty
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
config-drive: true
- name: devstack-f21 - name: devstack-f21
base-image: 'Fedora 21 (PVHVM)' base-image: 'Fedora 21 (PVHVM)'
min-ram: 8192 min-ram: 8192
@ -341,6 +350,12 @@ providers:
setup: prepare_node_devstack.sh setup: prepare_node_devstack.sh
username: jenkins username: jenkins
private-key: /home/nodepool/.ssh/id_rsa private-key: /home/nodepool/.ssh/id_rsa
- name: ubuntu-trusty
min-ram: 8192
diskimage: ubuntu-trusty
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
config-drive: true
- name: devstack-f21 - name: devstack-f21
base-image: 'Fedora 21 (PVHVM)' base-image: 'Fedora 21 (PVHVM)'
min-ram: 8192 min-ram: 8192
@ -410,6 +425,12 @@ providers:
setup: prepare_node_devstack.sh setup: prepare_node_devstack.sh
username: jenkins username: jenkins
private-key: /home/nodepool/.ssh/id_rsa private-key: /home/nodepool/.ssh/id_rsa
- name: ubuntu-trusty
min-ram: 8192
diskimage: ubuntu-trusty
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
config-drive: true
- name: devstack-precise-check - name: devstack-precise-check
base-image: 'Ubuntu 12.04 LTS (Precise Pangolin) (PVHVM)' base-image: 'Ubuntu 12.04 LTS (Precise Pangolin) (PVHVM)'
min-ram: 8192 min-ram: 8192