openstack
/
kolla
Code Issues Proposed changes

Merge "nova: Remove bridge_utils from base package"

This commit is contained in:
Zuul 2019-03-06 11:17:37 +00:00 committed by Gerrit Code Review
parent 673df91266 4991607b29
commit ac5103ee1a
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/nova/nova-base/Dockerfile.j2
View File

@ -11,7 +11,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_package_type == 'rpm' %}
{% set nova_base_packages = [
'bridge-utils',
'openstack-nova-common',
'openvswitch',
'python-cinderclient',
@ -37,7 +36,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% elif base_package_type == 'deb' %}
{% set nova_base_packages = [
'bridge-utils',
'nova-common',
'openvswitch-switch',
'python-nova'
@ -61,7 +59,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_package_type == 'rpm' %}
{% set nova_base_packages = [
'bridge-utils',
'openvswitch'
] %}
{% if base_arch == 'x86_64' %}
@ -83,7 +80,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% elif base_package_type == 'deb' %}
{% set nova_base_packages = [
'bridge-utils',
'dnsmasq',
'ebtables',
'iproute2',