opendev/system-config
Code Issues Proposed changes

Merge "Remove Fedora 25, add Fedora 27 mirror"

Browse Source
This commit is contained in:
Zuul 2017-12-04 22:53:45 +00:00 committed by Gerrit Code Review
commit d4e06c1cc7
2 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/openstack_project/files/mirror/fedora-mirror-update.sh
View File

@ -19,7 +19,7 @@ BASE="/afs/.openstack.org/mirror/fedora"
MIRROR="rsync://mirrors.kernel.org"
K5START="k5start -t -f /etc/fedora.keytab service/fedora-mirror -- timeout -k 2m 30m"
for REPO in releases/25 releases/26 ; do
for REPO in releases/26 releases/27 ; do
if ! [ -f $BASE/$REPO ]; then
$K5START mkdir -p $BASE/$REPO
fi
@ -41,7 +41,7 @@ for REPO in releases/25 releases/26 ; do
$MIRROR/fedora/$REPO/ $BASE/$REPO/
done
for REPO in updates/25 updates/26 ; do
for REPO in updates/26 updates/27 ; do
if ! [ -f $BASE/$REPO ]; then
$K5START mkdir -p $BASE/$REPO
fi

58
modules/openstack_project/templates/nodepool/nodepool-builder.logging.conf.erb
View File

@ -8,22 +8,22 @@
[loggers]
keys=root,nodepool,requests,shade,image,kazoo,
dib_debian-jessie, dib_ubuntu-trusty, dib_ubuntu-xenial, dib_centos-7,
dib_fedora-25, dib_fedora-26, dib_opensuse-422, dib_opensuse-423,
rax-dfw_upload, rax-ord_upload, rax-iad_upload, ovh-gra1_upload,
ovh-bhs1_upload, inap-mtl01_upload,
tripleo-test-cloud-rh1_upload, infracloud-vanilla_upload,
infracloud-chocolate_upload, citycloud-lon1_upload,
citycloud-kna1_upload, citycloud-la1_upload, citycloud-sto2_upload
dib_fedora-26, dib_gentoo, dib_opensuse-423, rax-dfw_upload,
rax-ord_upload, rax-iad_upload, ovh-gra1_upload, ovh-bhs1_upload,
inap-mtl01_upload, tripleo-test-cloud-rh1_upload,
infracloud-vanilla_upload, infracloud-chocolate_upload,
citycloud-lon1_upload, citycloud-kna1_upload, citycloud-la1_upload,
citycloud-sto2_upload, vexxhost-ca-ymq-1_upload
[handlers]
keys=console,debug,normal,image,
dib_debian-jessie, dib_ubuntu-trusty, dib_ubuntu-xenial, dib_centos-7,
dib_fedora-25, dib_fedora-26, dib_opensuse-422, dib_opensuse-423,
rax-dfw_upload, rax-ord_upload, rax-iad_upload, ovh-gra1_upload,
ovh-bhs1_upload, inap-mtl01_upload,
tripleo-test-cloud-rh1_upload, infracloud-vanilla_upload,
infracloud-chocolate_upload, citycloud-lon1_upload,
citycloud-kna1_upload, citycloud-la1_upload, citycloud-sto2_upload
dib_fedora-26, dib_gentoo, dib_opensuse-423, rax-dfw_upload,
rax-ord_upload, rax-iad_upload, ovh-gra1_upload, ovh-bhs1_upload,
inap-mtl01_upload, tripleo-test-cloud-rh1_upload,
infracloud-vanilla_upload, infracloud-chocolate_upload,
citycloud-lon1_upload, citycloud-kna1_upload, citycloud-la1_upload,
citycloud-sto2_upload, vexxhost-ca-ymq-1_upload
[formatters]
keys=simple
@ -138,18 +138,6 @@ class=logging.handlers.TimedRotatingFileHandler
formatter=simple
args=('<%= @image_log_document_root %>/dib.centos-7.log', 'H', 8, 30,)
[logger_dib_fedora-25]
level=DEBUG
handlers=dib_fedora-25
qualname=nodepool.image.build.fedora-25
propagate=0
[handler_dib_fedora-25]
level=DEBUG
class=logging.handlers.TimedRotatingFileHandler
formatter=simple
args=('<%= @image_log_document_root %>/dib.fedora-25.log', 'H', 8, 30,)
[logger_dib_fedora-26]
level=DEBUG
handlers=dib_fedora-26
@ -162,17 +150,17 @@ class=logging.handlers.TimedRotatingFileHandler
formatter=simple
args=('<%= @image_log_document_root %>/dib.fedora-26.log', 'H', 8, 30,)
[logger_dib_opensuse-422]
[logger_dib_gentoo]
level=DEBUG
handlers=dib_opensuse-422
qualname=nodepool.image.build.opensuse-422
handlers=dib_gentoo
qualname=nodepool.image.build.gentoo
propagate=0
[handler_dib_opensuse-422]
[handler_dib_gentoo]
level=DEBUG
class=logging.handlers.TimedRotatingFileHandler
formatter=simple
args=('<%= @image_log_document_root %>/dib.opensuse-422.log', 'H', 8, 30,)
args=('<%= @image_log_document_root %>/dib.gentoo.log', 'H', 8, 30,)
[logger_dib_opensuse-423]
level=DEBUG
@ -342,3 +330,15 @@ class=logging.handlers.TimedRotatingFileHandler
formatter=simple
args=('<%= @upload_log_document_root %>/citycloud-sto2.log', 'H', 8, 30,)
[logger_vexxhost-ca-ymq-1_upload]
level=DEBUG
handlers=vexxhost-ca-ymq-1_upload
qualname=nodepool.image.upload.vexxhost-ca-ymq-1
propagate=0
[handler_vexxhost-ca-ymq-1_upload]
level=DEBUG
class=logging.handlers.TimedRotatingFileHandler
formatter=simple
args=('<%= @upload_log_document_root %>/vexxhost-ca-ymq-1.log', 'H', 8, 30,)