diff options
| author | Zuul <zuul@review.opendev.org> | 2019-12-04 17:45:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-12-04 17:45:50 +0000 |
| commit | fb74313d7df98aabaa2fd3f8fb606110aa042d27 (patch) | |
| tree | 50a9075da44a9c01788a02b686a357cba00e569e /docker/nova | |
| parent | 59c881d85c4c9154a459c8c695f10243b387f047 (diff) | |
| parent | cf11cd6f3d1f0f0d9e1bb948672be12171a4099b (diff) | |
| download | kolla-fb74313d7df98aabaa2fd3f8fb606110aa042d27.tar.gz kolla-fb74313d7df98aabaa2fd3f8fb606110aa042d27.zip | |
Merge "Enable repos only when needed"
Diffstat (limited to 'docker/nova')
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 2 |
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 = [ |