diff options
| author | Zuul <zuul@review.opendev.org> | 2021-08-30 18:24:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-08-30 18:24:52 +0000 |
| commit | 605d596760f458d390f357fa9dc714344ba60646 (patch) | |
| tree | d928c65166ed599debcef8675ab15e776e66d827 /docker/base | |
| parent | 0ef09f9bbc2b6ff3a42dc75a1a68795eea6f9463 (diff) | |
| parent | 8d67183c82df8261c2f038a429186df2fcd44669 (diff) | |
| download | kolla-605d596760f458d390f357fa9dc714344ba60646.tar.gz kolla-605d596760f458d390f357fa9dc714344ba60646.zip | |
Merge "Install UCA GPG key"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 4f58d806b..0ebbdbb87 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -261,6 +261,12 @@ COPY dpkg_reducing_disk_footprint /etc/dpkg/dpkg.cfg.d/dpkg_reducing_disk_footpr 'curl', 'gnupg' ] %} +# ubuntu-cloud-keyring to install UCA packages +{% if base_distro == 'ubuntu' %} +{% set base_ubuntu_package_pre_packages = base_ubuntu_package_pre_packages + [ + 'ubuntu-cloud-keyring' +] %} +{% endif %} {{ macros.install_packages(base_ubuntu_package_pre_packages | customizable("base_ubuntu_package_pre_packages")) }} {% endblock %} |