openstack
/
kolla
Code Issues Proposed changes

Removed percona from ubuntu repos 

16.04 provides the percona-xtrabackup scripts in the main repos, so the
specific percona repo can be removed. Unfortunately, mariadb10.0 does
not build with galera built-in. So until ubuntu packages mariadb10.1,
we will be dependant on the external repos for mariadb with galera
built in.

Labels keys so they are easily identified in the future. In Jinja2 the
comments cannot go inline while generating the list.

Change-Id: I5e6c2f884c8d59bbc574b71ac731d1b4db18b68c
This commit is contained in:
Sam Yaple 2016-12-20 15:32:52 +00:00
parent 82ab3258c1
commit af7a1da807
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
docker/base/Dockerfile.j2
View File

@ -61,9 +61,9 @@ COPY {{ repo_file }} /etc/yum.repos.d/{{ repo_file }}
RUN true {% for key in base_yum_repo_keys | customizable('yum_repo_keys') %}&& rpm --import {{ key }} {% endfor %}
{% 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 #}
@ -218,15 +218,19 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
%}
{% if base_distro == 'ubuntu' %}
{# 05CE15085FC09D18E99EFB22684A14CF2582E0C5 -- InfluxDB Packaging Service <support@influxdb.com> #}
{# 177F4010FE56CA3336300305F1656F24C74CD1D8 -- MariaDB Signing Key <signing-key@mariadb.org> #}
{# 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> #}
{# 58118E89F3A912897C070ADBF76221572C52609D -- Docker Release Tool (releasedocker) <docker@docker.com> #}
{% set base_apt_keys = [
'0xF1656F24C74CD1D8',
'0x9334a25f8507efa5',
'05CE15085FC09D18E99EFB22684A14CF2582E0C5',
'177F4010FE56CA3336300305F1656F24C74CD1D8',
'391A9AA2147192839E9DB0315EDB1B62EC4926EA',
'430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A',
'418A7F2FB0E1E6E7EABF6FE8C2E73424D59097AB',
'46095ACC8548582C1A2699A9D27D666CD88E42B4',
'58118E89F3A912897C070ADBF76221572C52609D',
'05CE15085FC09D18E99EFB22684A14CF2582E0C5',
'418A7F2FB0E1E6E7EABF6FE8C2E73424D59097AB',
] %}
{% elif base_distro == 'debian' %}
{% set base_apt_keys = [

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

@ -13,9 +13,6 @@ 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 http://packages.elastic.co/elasticsearch/2.x/debian stable main

1
tools/setup_gate.sh
View File

@ -55,7 +55,6 @@ 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