diff options
| author | Zuul <zuul@review.opendev.org> | 2019-11-14 21:42:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-11-14 21:42:47 +0000 |
| commit | 4ff1255022a6e6bc8725caf0f42b455f66fb6e6d (patch) | |
| tree | 73a57ac68c5b314753a24ceac59d18728b18ab27 | |
| parent | 4ffff0c1830941b865f357ef9d66540b9c110964 (diff) | |
| parent | a8abbf34c0373f24d6417f19a2ba27f3d017e10f (diff) | |
| download | kolla-4ff1255022a6e6bc8725caf0f42b455f66fb6e6d.tar.gz kolla-4ff1255022a6e6bc8725caf0f42b455f66fb6e6d.zip | |
Merge "Revert "Move to RDO Train packages""
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/collectd/Dockerfile.j2 | 2 | ||||
| -rwxr-xr-x | kolla/common/config.py | 2 | ||||
| -rw-r--r-- | tests/templates/template_overrides.j2 | 4 |
4 files changed, 6 insertions, 4 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 69d6b2e48..e3d00cee6 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -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', diff --git a/docker/collectd/Dockerfile.j2 b/docker/collectd/Dockerfile.j2 index a35b4b297..a3cc0747b 100644 --- a/docker/collectd/Dockerfile.j2 +++ b/docker/collectd/Dockerfile.j2 @@ -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' ] %} diff --git a/kolla/common/config.py b/kolla/common/config.py index 765a4803e..82e3e189e 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -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')), diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2 index d907a8dcd..e69eab450 100644 --- a/tests/templates/template_overrides.j2 +++ b/tests/templates/template_overrides.j2 @@ -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 %} |