opendev/system-config
Code Issues Proposed changes

Merge "Add Fedora 22 DIB nodes"

Browse Source
This commit is contained in:
Jenkins 2015-09-29 22:06:52 +00:00 committed by Gerrit Code Review
commit b4822abf87
2 changed files with 67 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/openstack_project/templates/nodepool/nodepool.logging.conf.erb
View File

@ -6,10 +6,10 @@
#
[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_bare-precise,hpcloud-b1_bare-trusty,hpcloud-b1_bare-centos6,hpcloud-b1_devstack-f21,hpcloud-b1_devstack-centos7,hpcloud-b2_devstack-precise-check,hpcloud-b2_bare-precise,hpcloud-b2_bare-trusty,hpcloud-b2_bare-centos6,hpcloud-b2_devstack-f21,hpcloud-b2_devstack-centos7,hpcloud-b3_devstack-precise-check,hpcloud-b3_bare-precise,hpcloud-b3_bare-trusty,hpcloud-b3_bare-centos6,hpcloud-b3_devstack-f21,hpcloud-b3_devstack-centos7,hpcloud-b4_devstack-precise-check,hpcloud-b4_bare-precise,hpcloud-b4_bare-trusty,hpcloud-b4_bare-centos6,hpcloud-b4_devstack-f21,hpcloud-b4_devstack-centos7,hpcloud-b5_devstack-precise-check,hpcloud-b5_bare-precise,hpcloud-b5_bare-trusty,hpcloud-b5_bare-centos6,hpcloud-b5_devstack-f21,hpcloud-b5_devstack-centos7,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_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_bare-precise,hpcloud-b1_bare-trusty,hpcloud-b1_bare-centos6,hpcloud-b1_devstack-f21,hpcloud-b1_devstack-centos7,hpcloud-b2_devstack-precise-check,hpcloud-b2_bare-precise,hpcloud-b2_bare-trusty,hpcloud-b2_bare-centos6,hpcloud-b2_devstack-f21,hpcloud-b2_devstack-centos7,hpcloud-b3_devstack-precise-check,hpcloud-b3_bare-precise,hpcloud-b3_bare-trusty,hpcloud-b3_bare-centos6,hpcloud-b3_devstack-f21,hpcloud-b3_devstack-centos7,hpcloud-b4_devstack-precise-check,hpcloud-b4_bare-precise,hpcloud-b4_bare-trusty,hpcloud-b4_bare-centos6,hpcloud-b4_devstack-f21,hpcloud-b4_devstack-centos7,hpcloud-b5_devstack-precise-check,hpcloud-b5_bare-precise,hpcloud-b5_bare-trusty,hpcloud-b5_bare-centos6,hpcloud-b5_devstack-f21,hpcloud-b5_devstack-centos7,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,dib_fedora-22
[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_bare-precise,hpcloud-b1_bare-trusty,hpcloud-b1_bare-centos6,hpcloud-b1_devstack-f21,hpcloud-b1_devstack-centos7,hpcloud-b2_devstack-precise-check,hpcloud-b2_bare-precise,hpcloud-b2_bare-trusty,hpcloud-b2_bare-centos6,hpcloud-b2_devstack-f21,hpcloud-b2_devstack-centos7,hpcloud-b3_devstack-precise-check,hpcloud-b3_bare-precise,hpcloud-b3_bare-trusty,hpcloud-b3_bare-centos6,hpcloud-b3_devstack-f21,hpcloud-b3_devstack-centos7,hpcloud-b4_devstack-precise-check,hpcloud-b4_bare-precise,hpcloud-b4_bare-trusty,hpcloud-b4_bare-centos6,hpcloud-b4_devstack-f21,hpcloud-b4_devstack-centos7,hpcloud-b5_devstack-precise-check,hpcloud-b5_bare-precise,hpcloud-b5_bare-trusty,hpcloud-b5_bare-centos6,hpcloud-b5_devstack-f21,hpcloud-b5_devstack-centos7,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_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_bare-precise,hpcloud-b1_bare-trusty,hpcloud-b1_bare-centos6,hpcloud-b1_devstack-f21,hpcloud-b1_devstack-centos7,hpcloud-b2_devstack-precise-check,hpcloud-b2_bare-precise,hpcloud-b2_bare-trusty,hpcloud-b2_bare-centos6,hpcloud-b2_devstack-f21,hpcloud-b2_devstack-centos7,hpcloud-b3_devstack-precise-check,hpcloud-b3_bare-precise,hpcloud-b3_bare-trusty,hpcloud-b3_bare-centos6,hpcloud-b3_devstack-f21,hpcloud-b3_devstack-centos7,hpcloud-b4_devstack-precise-check,hpcloud-b4_bare-precise,hpcloud-b4_bare-trusty,hpcloud-b4_bare-centos6,hpcloud-b4_devstack-f21,hpcloud-b4_devstack-centos7,hpcloud-b5_devstack-precise-check,hpcloud-b5_bare-precise,hpcloud-b5_bare-trusty,hpcloud-b5_bare-centos6,hpcloud-b5_devstack-f21,hpcloud-b5_devstack-centos7,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,dib_fedora-22
[formatters]
keys=simple
@ -844,3 +844,15 @@ level=INFO
class=logging.handlers.TimedRotatingFileHandler
formatter=simple
args=('<%= @image_log_document_root %>/dib.devstack-fedora21-dib.log', 'H', 8, 30,)
[logger_dib_fedora-22]
level=INFO
handlers=dib_fedora-22
qualname=nodepool.image.build.fedora-22
propagate=0
[handler_dib_fedora-22]
level=INFO
class=logging.handlers.TimedRotatingFileHandler
formatter=simple
args=('<%= @image_log_document_root %>/dib.fedora-22.log', 'H', 8, 30,)

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

@ -222,6 +222,16 @@ labels:
- name: hpcloud-b3
- name: hpcloud-b4
- name: hpcloud-b5
- name: fedora-22
image: fedora-22
ready-script: configure_mirror.sh
min-ready: 1
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
@ -568,6 +578,12 @@ providers:
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
config-drive: true
- name: fedora-22
min-ram: 30720
diskimage: fedora-22
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
config-drive: true
- name: hpcloud-b2
region-name: 'region-b.geo-1'
cloud: hpcloud
@ -652,6 +668,12 @@ providers:
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
config-drive: true
- name: fedora-22
min-ram: 30720
diskimage: fedora-22
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
config-drive: true
- name: hpcloud-b3
region-name: 'region-b.geo-1'
cloud: hpcloud
@ -736,6 +758,12 @@ providers:
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
config-drive: true
- name: fedora-22
min-ram: 30720
diskimage: fedora-22
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
config-drive: true
- name: hpcloud-b4
region-name: 'region-b.geo-1'
cloud: hpcloud
@ -821,6 +849,12 @@ providers:
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
config-drive: true
- name: fedora-22
min-ram: 30720
diskimage: fedora-22
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
config-drive: true
- name: hpcloud-b5
region-name: 'region-b.geo-1'
cloud: hpcloud
@ -907,6 +941,12 @@ providers:
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
config-drive: true
- name: fedora-22
min-ram: 30720
diskimage: fedora-22
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
config-drive: true
- name: ovh-gra1
region-name: 'GRA1'
cloud: ovh
@ -1079,3 +1119,16 @@ diskimages:
TMPDIR: /opt/dib_tmp
DIB_IMAGE_CACHE: /opt/dib_cache
QEMU_IMG_OPTIONS: compat=0.10
- name: fedora-22
elements:
- fedora
- vm
- openstack-repos
- puppet
- nodepool-base
- node-devstack
release: 22
env-vars:
TMPDIR: /opt/dib_tmp
DIB_IMAGE_CACHE: /opt/dib_cache
QEMU_IMG_OPTIONS: compat=0.10