From 4dce5693430cd3d3c82a9f3f2d2f8e66d0be6c06 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Fri, 1 Dec 2017 14:30:19 +1100
Subject: [PATCH] Remove Fedora 25, add Fedora 27 mirror

Remove Fedora 25 from the mirror script and add Fedora 27.  Update the
nodepool builder logging conf file, as the builds were removed
in I1fae6458402d6afe97069c3a17bbbf563afff20b.

Change-Id: Ib8d1b4bb3069cf48d1abc7c6fccd56d16bf54739
---
 .../files/mirror/fedora-mirror-update.sh      |  4 +-
 .../nodepool-builder.logging.conf.erb         | 58 +++++++++----------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/modules/openstack_project/files/mirror/fedora-mirror-update.sh b/modules/openstack_project/files/mirror/fedora-mirror-update.sh
index 4aa4ae12f6..212b1bf909 100644
--- a/modules/openstack_project/files/mirror/fedora-mirror-update.sh
+++ b/modules/openstack_project/files/mirror/fedora-mirror-update.sh
@@ -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
diff --git a/modules/openstack_project/templates/nodepool/nodepool-builder.logging.conf.erb b/modules/openstack_project/templates/nodepool/nodepool-builder.logging.conf.erb
index ff52f757f5..80fce0acf4 100644
--- a/modules/openstack_project/templates/nodepool/nodepool-builder.logging.conf.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool-builder.logging.conf.erb
@@ -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,)
+