openstack
/
kolla
Code Issues Proposed changes

Revert "Removed percona from ubuntu repos" 

This reverts commit af7a1da807.

Co-Authored-By: Michal (inc0) Jastrzebski <inc007@gmail.com>

Change-Id: I81df3bf01f618dbc7f771ee2e188eaa562ffe9db
Closes-Bug: #1659981
This commit is contained in:
Sam Yaple 2017-01-30 22:13:17 +00:00
parent b8dcc311f3
commit ab1d757a62
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/base/Dockerfile.j2
View File

@ -77,9 +77,9 @@ COPY {{ repo_file }} /etc/yum.repos.d/{{ repo_file }}
{% if install_metatype in ['rdo', 'mixed'] %}
{% for cmd in rpm_setup %}
{% for cmd in rpm_setup %}
{{ cmd }}
{% endfor %}
{% endfor %}
{% endif %}
{# endif for repo setup for all RHEL except RHEL OSP #}
@ -251,6 +251,7 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
{# 391A9AA2147192839E9DB0315EDB1B62EC4926EA -- Canonical Cloud Archive Signing Key <ftpmaster@canonical.com> #}
{# 418A7F2FB0E1E6E7EABF6FE8C2E73424D59097AB -- packagecloud ops (production key) <ops@packagecloud.io> #}
{# 46095ACC8548582C1A2699A9D27D666CD88E42B4 -- Elasticsearch (Elasticsearch Signing Key) <dev_ops@elasticsearch.org> #}
{# 4D1BB29D63D98E422B2113B19334A25F8507EFA5 -- Percona MySQL Development Team (Packaging key) <mysql-dev@percona.com> #}
{# 58118E89F3A912897C070ADBF76221572C52609D -- Docker Release Tool (releasedocker) <docker@docker.com> #}
{% set base_apt_keys = [
'05CE15085FC09D18E99EFB22684A14CF2582E0C5',
@ -258,6 +259,7 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
'391A9AA2147192839E9DB0315EDB1B62EC4926EA',
'418A7F2FB0E1E6E7EABF6FE8C2E73424D59097AB',
'46095ACC8548582C1A2699A9D27D666CD88E42B4',
'4D1BB29D63D98E422B2113B19334A25F8507EFA5',
'58118E89F3A912897C070ADBF76221572C52609D',
] %}
{% elif base_distro == 'debian' %}

3
docker/base/sources.list.ubuntu
View File

@ -13,6 +13,9 @@ deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main
# MariaDB 10.0 repo
deb http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.0/ubuntu xenial main
# Percona repo (for xtrabackup)
deb http://repo.percona.com/apt xenial main
# Elastic repo
deb https://packages.elastic.co/elasticsearch/2.x/debian stable main

1
tools/setup_gate.sh
View File

@ -56,6 +56,7 @@ EOF
# Append non-infra provided repos to list
cat << EOF | sudo tee -a /etc/kolla/sources.list
deb http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.0/ubuntu xenial main
deb http://repo.percona.com/apt xenial main
deb http://packages.elastic.co/elasticsearch/2.x/debian stable main
deb http://packages.elastic.co/kibana/4.6/debian stable main
EOF