opendev/system-config
Code Issues Proposed changes

Fixes to ubuntu-mariadb mirror

Browse Source 
Changes that are needed to make reprepro function properly.

Change-Id: I344f529e8edf7a9f272774db8dd42330919c4e65
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2017-03-02 13:39:51 -05:00
parent 1002b90018
commit 7e7956bd66
4 changed files with 24 additions and 8 deletions

12
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 Method: http://ftp.osuosl.org/pub/mariadb/repo/10.0/ubuntu
Components: main Components: main
UDebComponents: main UDebComponents:
Architectures: amd64 Architectures: amd64
GetInRelease: no GetInRelease: no
VerifyRelease: 1BB943DB 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

12
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 Method: http://ftp.osuosl.org/pub/mariadb/repo/10.1/ubuntu
Components: main Components: main
UDebComponents: main UDebComponents:
Architectures: amd64 Architectures: amd64
GetInRelease: no GetInRelease: no
VerifyRelease: 1BB943DB 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

4
modules/openstack_project/manifests/mariadb_mirror.pp

@ -5,7 +5,7 @@ define openstack_project::mariadb_mirror (
### MariaDB mirror ### ### MariaDB mirror ###
::openstack_project::reprepro { "ubuntu-mariadb-$name-reprepro-mirror": ::openstack_project::reprepro { "ubuntu-mariadb-$name-reprepro-mirror":
confdir => "/etc/reprepro/ubuntu-mariadb-$name", 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', distributions => 'openstack_project/reprepro/distributions.ubuntu-mariadb.erb',
updates_file => "puppet:///modules/openstack_project/reprepro/ubuntu-mariadb-$name-updates", updates_file => "puppet:///modules/openstack_project/reprepro/ubuntu-mariadb-$name-updates",
releases => [ 'trusty', 'xenial' ], releases => [ 'trusty', 'xenial' ],
@ -15,7 +15,7 @@ define openstack_project::mariadb_mirror (
user => $user, user => $user,
hour => '*/2', hour => '*/2',
minute => '0', 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', environment => 'PATH=/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin',
} }
} }

4
modules/openstack_project/templates/reprepro/distributions.ubuntu-mariadb.erb

@ -4,9 +4,9 @@ Codename: <%= release %>
Description: OpenStack MariaDB <%= release.capitalize %> mirror Description: OpenStack MariaDB <%= release.capitalize %> mirror
Architectures: amd64 Architectures: amd64
Components: main Components: main
UDebComponents: main UDebComponents:
Contents: .gz Contents: .gz
Update: ubuntu-mariadb Update: ubuntu-mariadb-<%= release %>
Log: <%= @logdir %>/ubuntu-mariadb-<%= release %>.log Log: <%= @logdir %>/ubuntu-mariadb-<%= release %>.log
<% end -%> <% end -%>