Browse Source

Merge "Revert "Move to RDO Train packages""

tags/10.0.0.0rc1
Zuul 10 months ago
committed by Gerrit Code Review
parent
commit
4ff1255022
4 changed files with 6 additions and 4 deletions
  1. +0
    -2
      docker/base/Dockerfile.j2
  2. +1
    -1
      docker/collectd/Dockerfile.j2
  3. +1
    -1
      kolla/common/config.py
  4. +4
    -0
      tests/templates/template_overrides.j2

+ 0
- 2
docker/base/Dockerfile.j2 View File

@@ -164,14 +164,12 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
{% endblock %}

{% set base_centos_yum_repo_keys = [
'/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud',
'/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-OpsTools',
'/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage',
'/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization'
] %}

{% set base_centos_yum_repo_packages = [
'centos-release-openstack-train',
'centos-release-ceph-nautilus',
'centos-release-opstools',
'centos-release-qemu-ev',


+ 1
- 1
docker/collectd/Dockerfile.j2 View File

@@ -61,7 +61,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'collectd-procevent',
'collectd-snmp-agent',
'collectd-sysevent',
'python2-collectd-gnocchi',
'python-collectd-gnocchi',
'python2-collectd-rabbitmq-monitoring',
'python2-sqlalchemy-collectd'
] %}


+ 1
- 1
kolla/common/config.py View File

@@ -263,7 +263,7 @@ _BASE_OPTS = [
help=('Set the package type of the distro. If not set then '
'the packaging type is set to "rpm" if a RHEL based '
'distro and "deb" if a Debian based distro.')),
cfg.ListOpt('rpm_setup_config', default=[],
cfg.ListOpt('rpm_setup_config', default=[DELOREAN, DELOREAN_DEPS],
help=('Comma separated list of .rpm or .repo file(s) '
'or URL(s) to install before building containers')),
cfg.StrOpt('apt_sources_list', help=('Path to custom sources.list')),


+ 4
- 0
tests/templates/template_overrides.j2 View File

@@ -43,6 +43,10 @@ RUN sed -i \
{% block base_centos_repo_overrides_post_rpm %}
{% endraw %}

RUN sed -i \
-e "s|https://trunk.rdoproject.org|{{ nodepool_rdo_proxy }}|g" \
/etc/yum.repos.d/delorean*.repo

{% raw %}
{% endblock %}



Loading…
Cancel
Save