diff options
| author | Zuul <zuul@review.openstack.org> | 2019-03-06 11:17:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-03-06 11:17:37 +0000 |
| commit | ac5103ee1a5e45ef53c2187e48985977f927a3ac (patch) | |
| tree | dcb80c3ce72b68d4d9989dc5622f2527a6cca050 /docker | |
| parent | 673df9126636658cd8d2fd48f445cbec7f4b1614 (diff) | |
| parent | 4991607b29ef5972953380a582b1778a571cc4ce (diff) | |
| download | kolla-ac5103ee1a5e45ef53c2187e48985977f927a3ac.tar.gz kolla-ac5103ee1a5e45ef53c2187e48985977f927a3ac.zip | |
Merge "nova: Remove bridge_utils from base package"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/nova/nova-base/Dockerfile.j2 | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2 index de9e6a20f..45d275c76 100644 --- a/docker/nova/nova-base/Dockerfile.j2 +++ b/docker/nova/nova-base/Dockerfile.j2 @@ -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', |