diff options
| author | Zuul <zuul@review.opendev.org> | 2021-10-22 17:42:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-10-22 17:42:27 +0000 |
| commit | 7e1910679b112a62052beccfc0e4807517d3e08b (patch) | |
| tree | 926ee6a7da017f3dd783f045cc6faf4cbfaa7318 /docker | |
| parent | 5dfc361b6567db81afe0ad87b1e510750ea6b51d (diff) | |
| parent | 3df1a1dde9dda0b4dfd6c91da65b53e58bb0d219 (diff) | |
| download | kolla-7e1910679b112a62052beccfc0e4807517d3e08b.tar.gz kolla-7e1910679b112a62052beccfc0e4807517d3e08b.zip | |
Merge "ovn: Add Debian x86 images"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ovn/ovn-base/Dockerfile.j2 | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/docker/ovn/ovn-base/Dockerfile.j2 b/docker/ovn/ovn-base/Dockerfile.j2 index d543419e9..99775bbcc 100644 --- a/docker/ovn/ovn-base/Dockerfile.j2 +++ b/docker/ovn/ovn-base/Dockerfile.j2 @@ -12,13 +12,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'openvswitch-ovn-common', ] %} -{% elif base_distro in ['debian'] %} - # NOTE(hrw): 'ovn-common' is provided by 'openvswitch-common' - {% set ovn_base_packages = [ - 'openvswitch-common', - ] %} - -{% elif base_distro in ['ubuntu'] %} +{% elif base_package_type == 'deb' %} {% set ovn_base_packages = [ 'ovn-common', ] %} |