diff options
| author | Zuul <zuul@review.opendev.org> | 2019-10-26 13:24:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-10-26 13:24:19 +0000 |
| commit | 7b309f830034319e3f7db8efb424448e43ccae21 (patch) | |
| tree | 9bcb9496196c4d348947aee7b3cd6dfaa487680a | |
| parent | 88f374c914c4d6709a1edf407a912c8cf566038b (diff) | |
| parent | c78c82c9630b334cbaef040d68bce7e5ae8cc118 (diff) | |
| download | kolla-7b309f830034319e3f7db8efb424448e43ccae21.tar.gz kolla-7b309f830034319e3f7db8efb424448e43ccae21.zip | |
Merge "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, 4 insertions, 6 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 04aeee35a..16c0e1d5a 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -164,12 +164,14 @@ 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 a3cc0747b..a35b4b297 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', - 'python-collectd-gnocchi', + 'python2-collectd-gnocchi', 'python2-collectd-rabbitmq-monitoring', 'python2-sqlalchemy-collectd' ] %} diff --git a/kolla/common/config.py b/kolla/common/config.py index 0741dc74b..17be2d77d 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -285,7 +285,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=[DELOREAN, DELOREAN_DEPS], + cfg.ListOpt('rpm_setup_config', default=[], 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 3dc7035ca..761bf0e83 100644 --- a/tests/templates/template_overrides.j2 +++ b/tests/templates/template_overrides.j2 @@ -43,10 +43,6 @@ 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 %} |