Drop ubuntu-mariadb mirror
The mirror was put in place for OpenStack Ansible however the project is not consuming it anymore. In the parent change of this commit, the addition of a reverse proxy cache will be used instead in the project and it will allow usage across all distributions. Change-Id: I30bd6b658d87abc765b5caee5003e387981850b4
This commit is contained in:
Mohammed Naser
parent
40cbd74315
commit
3338761d3b
|
|
@ -1,15 +0,0 @@
|
|||
Name: ubuntu-mariadb-trusty
|
||||
Method: http://ftp.osuosl.org/pub/mariadb/repo/10.0/ubuntu
|
||||
Components: 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
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
Name: ubuntu-mariadb-trusty
|
||||
Method: http://ftp.osuosl.org/pub/mariadb/repo/10.1/ubuntu
|
||||
Components: 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
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
# == Define: openstack_project::mariadb_mirror
|
||||
#
|
||||
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",
|
||||
distributions => 'openstack_project/reprepro/distributions.ubuntu-mariadb.erb',
|
||||
updates_file => "puppet:///modules/openstack_project/reprepro/ubuntu-mariadb-$name-updates",
|
||||
releases => [ 'trusty', 'xenial' ],
|
||||
}
|
||||
|
||||
# NOTE(ianw) we have several versions, but they all share the same
|
||||
# mirror.ubuntu-mariadb volume. Start them at offset times, but
|
||||
# also share the lock so that one doesn't release the volume when
|
||||
# the other is half-complete.
|
||||
cron { "reprepro ubuntu mariadb $name":
|
||||
user => $user,
|
||||
hour => '*/2',
|
||||
minute => fqdn_rand(30, $name),
|
||||
command => "flock -w 3600 /var/run/reprepro/ubuntu-mariadb.lock reprepro-mirror-update /etc/reprepro/ubuntu-mariadb-$name mirror.ubuntu-mariadb >>/var/log/reprepro/ubuntu-mariadb-$name-mirror.log 2>&1",
|
||||
environment => 'PATH=/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin',
|
||||
}
|
||||
}
|
||||
|
|
@ -224,17 +224,6 @@ class openstack_project::mirror (
|
|||
]
|
||||
}
|
||||
|
||||
# Create the symlink to Ubuntu MariaDB.
|
||||
file { "${www_root}/ubuntu-mariadb":
|
||||
ensure => link,
|
||||
target => "${mirror_root}/ubuntu-mariadb",
|
||||
owner => root,
|
||||
group => root,
|
||||
require => [
|
||||
File["${www_root}"],
|
||||
]
|
||||
}
|
||||
|
||||
# Create the symlink to deb-docker.
|
||||
file { "${www_root}/deb-docker":
|
||||
ensure => link,
|
||||
|
|
@ -257,11 +246,6 @@ class openstack_project::mirror (
|
|||
]
|
||||
}
|
||||
|
||||
# TODO(pabelanger): We can remove this after puppet runs a few times.
|
||||
file { "${www_root}/mariadb":
|
||||
ensure => absent,
|
||||
}
|
||||
|
||||
file { "${www_root}/gem":
|
||||
ensure => link,
|
||||
target => "${gem_root}",
|
||||
|
|
|
|||
|
|
@ -571,40 +571,6 @@ class openstack_project::mirror_update (
|
|||
key_source => 'puppet:///modules/openstack_project/reprepro/ubuntu-cloud-archive-gpg-key.asc',
|
||||
}
|
||||
|
||||
### MariaDB mirror ###
|
||||
::openstack_project::mariadb_mirror { '10.0':
|
||||
require => [
|
||||
File['/usr/local/bin/reprepro-mirror-update'],
|
||||
File['/etc/afsadmin.keytab'],
|
||||
File['/etc/reprepro.keytab'],
|
||||
]
|
||||
}
|
||||
::openstack_project::mariadb_mirror { '10.1':
|
||||
require => [
|
||||
File['/usr/local/bin/reprepro-mirror-update'],
|
||||
File['/etc/afsadmin.keytab'],
|
||||
File['/etc/reprepro.keytab'],
|
||||
]
|
||||
}
|
||||
|
||||
gnupg_key { 'MariaDB Package Signing Key':
|
||||
ensure => present,
|
||||
# 1993 69E5 404B D5FC 7D2F E43B CBCB 082A 1BB9 43DB
|
||||
key_id => 'CBCB082A1BB943DB',
|
||||
user => 'root',
|
||||
key_type => 'public',
|
||||
key_source => 'puppet:///modules/openstack_project/reprepro/mariadb-mirror-gpg-key.asc',
|
||||
}
|
||||
|
||||
gnupg_key { 'MariaDB Package Signing Key (new)':
|
||||
ensure => present,
|
||||
# 177F 4010 FE56 CA33 3630 0305 F165 6F24 C74C D1D8
|
||||
key_id => 'F1656F24C74CD1D8',
|
||||
user => 'root',
|
||||
key_type => 'public',
|
||||
key_source => 'puppet:///modules/openstack_project/reprepro/mariadb-mirror-new-gpg-key.asc',
|
||||
}
|
||||
|
||||
# AFS Monitoring
|
||||
file { '/etc/afsmon.cfg':
|
||||
ensure => present,
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
<% @releases.each do |release| -%>
|
||||
Origin: MariaDB
|
||||
Codename: <%= release %>
|
||||
Description: OpenStack MariaDB <%= release.capitalize %> mirror
|
||||
Architectures: amd64
|
||||
Components: main
|
||||
UDebComponents:
|
||||
Contents: .gz
|
||||
Update: ubuntu-mariadb-<%= release %>
|
||||
Log: <%= @logdir %>/ubuntu-mariadb-<%= release %>.log
|
||||
|
||||
<% end -%>
|
||||
Loading…
Reference in New Issue