diff options
| author | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2018-10-10 10:26:48 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2018-10-10 10:06:11 +0000 |
| commit | 232cc372c3180319c7fd62be68e3340c955fe563 (patch) | |
| tree | a981c5004e31c8ce0c610dd29aca085f0fb827e9 | |
| parent | e3ad9538bbd4b37c6260225e4b84f60f34dc43a7 (diff) | |
| download | kolla-232cc372c3180319c7fd62be68e3340c955fe563.tar.gz kolla-232cc372c3180319c7fd62be68e3340c955fe563.zip | |
neutron-base: unify Debian/Ubuntu part
Change-Id: I13d75c3fafd2f1e26da6e85cacb7b84601096d8d
| -rw-r--r-- | docker/neutron/neutron-base/Dockerfile.j2 | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index 13735a364..69a981006 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -30,7 +30,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'python2-oslo-vmware' ] %} - {% elif base_distro in ['debian'] %} + {% elif base_distro in ['debian', 'ubuntu'] %} {% set neutron_base_packages = [ 'iproute2', @@ -42,31 +42,27 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'neutron-server', 'openvswitch-switch', 'python-networking-sfc', - 'python-networking-vmware-nsx', 'python-openvswitch', 'python-oslo.vmware' ] %} - {% elif base_distro in ['ubuntu'] %} + {% if base_distro == 'debian' %} - # FIXED(jeffrey4l): UCA rocky release is not include python-vmware-nsx - # 13.0.0 package now. add 'python-vmware-nsx' into - # neutron_base_packages list after UCA fixed the issue. - {% set neutron_base_packages = [ - 'iproute2', - 'iputils-ping', - 'keepalived', - 'net-tools', - 'radvd', - 'neutron-lbaas-common', - 'neutron-plugin-ml2', - 'neutron-server', - 'openvswitch-switch', - 'python-networking-sfc', - 'python-neutron-fwaas', - 'python-openvswitch', - 'python-oslo.vmware' - ] %} + {% set neutron_base_packages = neutron_base_packages + [ + 'python-networking-vmware-nsx' + ] %} + + {% else %} + + # FIXED(jeffrey4l): UCA rocky release is not include python-vmware-nsx + # 13.0.0 package now. add 'python-vmware-nsx' into + # neutron_base_packages list after UCA fixed the issue. + {% set neutron_base_packages = neutron_base_packages + [ + 'neutron-lbaas-common', + 'python-neutron-fwaas', + ] %} + + {% endif %} {% endif %} |