diff options
| author | Zuul <zuul@review.opendev.org> | 2019-09-16 13:14:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-09-16 13:14:01 +0000 |
| commit | b8950dbfae16e4959e7e502b584018fc8e58eaaf (patch) | |
| tree | 3ba91b21b8935d677c75b74dbcab958e9f40781d /docker/base | |
| parent | b98182d9e9146144dfa711f6ee91bcca5d2708b1 (diff) | |
| parent | 016c0f577c535def40dd32ddf41e6cb145a2f9b8 (diff) | |
| download | kolla-b8950dbfae16e4959e7e502b584018fc8e58eaaf.tar.gz kolla-b8950dbfae16e4959e7e502b584018fc8e58eaaf.zip | |
Merge "Drop Percona XtraBackup in favour of MariaDB Backup"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | docker/base/percona-release.repo | 15 | ||||
| -rw-r--r-- | docker/base/sources.list.ubuntu | 4 |
3 files changed, 0 insertions, 24 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 209b191e6..395ebb043 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -80,12 +80,10 @@ COPY yum.conf /etc/yum.conf 'grafana.repo', 'influxdb.repo', 'opendaylight.repo', - 'percona-release.repo', 'rabbitmq_rabbitmq-server.repo', 'td.repo' ] %} - ## NOTE(yoctozepto): Percona keys omitted on purpose (handled via the repo file for compatibility with Zuul) {% set base_yum_repo_keys = [ 'https://artifacts.elastic.co/GPG-KEY-elasticsearch', 'https://packages.grafana.com/gpg.key', @@ -345,7 +343,6 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences {# 391A9AA2147192839E9DB0315EDB1B62EC4926EA -- Canonical Cloud Archive Signing Key <ftpmaster@canonical.com> #} {# 46095ACC8548582C1A2699A9D27D666CD88E42B4 -- Elasticsearch (Elasticsearch Signing Key) <dev_ops@elasticsearch.org> #} {# 49B07274951063870A8B7EAE7B8AA1A344C05248 -- Opendaylight Signing Key <https://launchpad.net/~odl-team> #} - {# 4D1BB29D63D98E422B2113B19334A25F8507EFA5 -- Percona MySQL Development Team (Packaging key) <mysql-dev@percona.com> #} {# 58118E89F3A912897C070ADBF76221572C52609D -- Docker Release Tool (releasedocker) <docker@docker.com> #} {# 4D8EB5FDA37AB55F41A135203BF88A0C6A770882 -- Apache Qpid PPA Signing Key <dev@qpid.apache.org> #} {# 901F9177AB97ACBE -- Treasure Data, Inc (Treasure Agent Official Signing key) <support@treasure-data.com> #} @@ -355,7 +352,6 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences '391A9AA2147192839E9DB0315EDB1B62EC4926EA', '46095ACC8548582C1A2699A9D27D666CD88E42B4', '49B07274951063870A8B7EAE7B8AA1A344C05248', - '4D1BB29D63D98E422B2113B19334A25F8507EFA5', '58118E89F3A912897C070ADBF76221572C52609D', '4D8EB5FDA37AB55F41A135203BF88A0C6A770882', '901F9177AB97ACBE', @@ -370,7 +366,6 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences {% elif base_distro == 'debian' %} {% set base_apt_keys = [ '46095ACC8548582C1A2699A9D27D666CD88E42B4', - '4D1BB29D63D98E422B2113B19334A25F8507EFA5', ] %} {% set remote_apt_keys = [ 'https://download.docker.com/linux/debian/gpg', diff --git a/docker/base/percona-release.repo b/docker/base/percona-release.repo deleted file mode 100644 index 74bb1623a..000000000 --- a/docker/base/percona-release.repo +++ /dev/null @@ -1,15 +0,0 @@ -[percona-release-$basearch] -name = Percona-Release YUM repository - $basearch -baseurl = https://repo.percona.com/release/$releasever/RPMS/$basearch -enabled = 0 -gpgcheck = 1 -gpgkey = https://repo.percona.com/yum/RPM-GPG-KEY-Percona - https://repo.percona.com/yum/PERCONA-PACKAGING-KEY - -[percona-release-noarch] -name = Percona-Release YUM repository - noarch -baseurl = https://repo.percona.com/release/$releasever/RPMS/noarch -enabled = 0 -gpgcheck = 1 -gpgkey = https://repo.percona.com/yum/RPM-GPG-KEY-Percona - https://repo.percona.com/yum/PERCONA-PACKAGING-KEY diff --git a/docker/base/sources.list.ubuntu b/docker/base/sources.list.ubuntu index 3ffe3449b..4e8e4d121 100644 --- a/docker/base/sources.list.ubuntu +++ b/docker/base/sources.list.ubuntu @@ -36,9 +36,5 @@ deb http://ppa.launchpad.net/odl-team/carbon/ubuntu xenial main # rabbitmq repo deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ bionic main -# Percona XtraBackup repo -# NOTE(yoctozepto): enabled only in the xtrabackup image (to spare MariaDB deps and allow Zuul override) -#deb http://repo.percona.com/apt bionic main - # MariaDB repo deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main |