aboutsummaryrefslogtreecommitdiff
path: root/docker/nova
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2019-11-21 17:14:09 +0100
committerMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2019-11-29 11:38:06 +0100
commitcf11cd6f3d1f0f0d9e1bb948672be12171a4099b (patch)
tree389a9c5d535180801bd2547a38fd591d11e12720 /docker/nova
parent9938857d7d331743d71328831241edf21e42d160 (diff)
downloadkolla-cf11cd6f3d1f0f0d9e1bb948672be12171a4099b.tar.gz
kolla-cf11cd6f3d1f0f0d9e1bb948672be12171a4099b.zip
Enable repos only when needed
Disable external repositories by default and enable only when needed. Depends-on: https://review.opendev.org/696480 Implements: blueprint repos-off-by-default Change-Id: Icf2a8397a8349e0fe849d88d160409fd234480a9
Diffstat (limited to 'docker/nova')
-rw-r--r--docker/nova/nova-compute/Dockerfile.j22
-rw-r--r--docker/nova/nova-libvirt/Dockerfile.j22
2 files changed, 4 insertions, 0 deletions
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2
index c22b76b2c..a8e103694 100644
--- a/docker/nova/nova-compute/Dockerfile.j2
+++ b/docker/nova/nova-compute/Dockerfile.j2
@@ -5,6 +5,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
+{{ macros.enable_extra_repos(['ceph']) }}
+
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2
index 9fb812395..12ca843ef 100644
--- a/docker/nova/nova-libvirt/Dockerfile.j2
+++ b/docker/nova/nova-libvirt/Dockerfile.j2
@@ -7,6 +7,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='nova', groups='qemu') }}
+{{ macros.enable_extra_repos(['ceph']) }}
+
{% if base_package_type == 'rpm' %}
{% set nova_libvirt_packages = [