From 7e7956bd66c77a1e203eec01518f0d60c9c5132c Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Thu, 2 Mar 2017 13:39:51 -0500
Subject: [PATCH] Fixes to ubuntu-mariadb mirror

Changes that are needed to make reprepro function properly.

Change-Id: I344f529e8edf7a9f272774db8dd42330919c4e65
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 .../files/reprepro/ubuntu-mariadb-10.0-updates       | 12 ++++++++++--
 .../files/reprepro/ubuntu-mariadb-10.1-updates       | 12 ++++++++++--
 .../openstack_project/manifests/mariadb_mirror.pp    |  4 ++--
 .../reprepro/distributions.ubuntu-mariadb.erb        |  4 ++--
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/modules/openstack_project/files/reprepro/ubuntu-mariadb-10.0-updates b/modules/openstack_project/files/reprepro/ubuntu-mariadb-10.0-updates
index eac033185b..77b4f4f5eb 100644
--- a/modules/openstack_project/files/reprepro/ubuntu-mariadb-10.0-updates
+++ b/modules/openstack_project/files/reprepro/ubuntu-mariadb-10.0-updates
@@ -1,7 +1,15 @@
-Name: ubuntu-mariadb
+Name: ubuntu-mariadb-trusty
 Method: http://ftp.osuosl.org/pub/mariadb/repo/10.0/ubuntu
 Components: main
-UDebComponents: main
+UDebComponents:
 Architectures: amd64
 GetInRelease: no
 VerifyRelease: 1BB943DB
+
+Name: ubuntu-mariadb-xenial
+Method: http://ftp.osuosl.org/pub/mariadb/repo/10.0/ubuntu
+Components: main
+UDebComponents:
+Architectures: amd64
+GetInRelease: no
+VerifyRelease: F1656F24C74CD1D8
diff --git a/modules/openstack_project/files/reprepro/ubuntu-mariadb-10.1-updates b/modules/openstack_project/files/reprepro/ubuntu-mariadb-10.1-updates
index 904426e0d9..68e78c40b8 100644
--- a/modules/openstack_project/files/reprepro/ubuntu-mariadb-10.1-updates
+++ b/modules/openstack_project/files/reprepro/ubuntu-mariadb-10.1-updates
@@ -1,7 +1,15 @@
-Name: ubuntu-mariadb
+Name: ubuntu-mariadb-trusty
 Method: http://ftp.osuosl.org/pub/mariadb/repo/10.1/ubuntu
 Components: main
-UDebComponents: main
+UDebComponents:
 Architectures: amd64
 GetInRelease: no
 VerifyRelease: 1BB943DB
+
+Name: ubuntu-mariadb-xenial
+Method: http://ftp.osuosl.org/pub/mariadb/repo/10.1/ubuntu
+Components: main
+UDebComponents:
+Architectures: amd64
+GetInRelease: no
+VerifyRelease: F1656F24C74CD1D8
diff --git a/modules/openstack_project/manifests/mariadb_mirror.pp b/modules/openstack_project/manifests/mariadb_mirror.pp
index 7a3de8f90b..53501a8f32 100644
--- a/modules/openstack_project/manifests/mariadb_mirror.pp
+++ b/modules/openstack_project/manifests/mariadb_mirror.pp
@@ -5,7 +5,7 @@ define openstack_project::mariadb_mirror (
   ### MariaDB mirror ###
   ::openstack_project::reprepro { "ubuntu-mariadb-$name-reprepro-mirror":
     confdir       => "/etc/reprepro/ubuntu-mariadb-$name",
-    basedir       => "/afs/.openstack.org/mirror/ubuntu-mariadb-$name",
+    basedir       => "/afs/.openstack.org/mirror/ubuntu-mariadb/$name",
     distributions => 'openstack_project/reprepro/distributions.ubuntu-mariadb.erb',
     updates_file  => "puppet:///modules/openstack_project/reprepro/ubuntu-mariadb-$name-updates",
     releases      => [ 'trusty', 'xenial' ],
@@ -15,7 +15,7 @@ define openstack_project::mariadb_mirror (
     user        => $user,
     hour        => '*/2',
     minute      => '0',
-    command     => "flock -n /var/run/reprepro/ubuntu-mariadb-$name.lock reprepro-mirror-update /etc/reprepro/ubuntu-mariadab-$name mirror.ubuntu-mariadb-$name >>/var/log/reprepro/ubuntu-mariadb-$name-mirror.log 2>&1",
+    command     => "flock -n /var/run/reprepro/ubuntu-mariadb-$name.lock reprepro-mirror-update /etc/reprepro/ubuntu-mariadb-$name mirror.ubuntu-mariadb-$name >>/var/log/reprepro/ubuntu-mariadb-$name-mirror.log 2>&1",
     environment => 'PATH=/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin',
   }
 }
diff --git a/modules/openstack_project/templates/reprepro/distributions.ubuntu-mariadb.erb b/modules/openstack_project/templates/reprepro/distributions.ubuntu-mariadb.erb
index e2d32f21f7..86c9bef398 100644
--- a/modules/openstack_project/templates/reprepro/distributions.ubuntu-mariadb.erb
+++ b/modules/openstack_project/templates/reprepro/distributions.ubuntu-mariadb.erb
@@ -4,9 +4,9 @@ Codename: <%= release %>
 Description: OpenStack MariaDB <%= release.capitalize %> mirror
 Architectures: amd64
 Components: main
-UDebComponents: main
+UDebComponents:
 Contents: .gz
-Update: ubuntu-mariadb
+Update: ubuntu-mariadb-<%= release %>
 Log: <%= @logdir %>/ubuntu-mariadb-<%= release %>.log
 
 <% end -%>