diff options
| author | Zuul <zuul@review.openstack.org> | 2018-11-06 08:38:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-11-06 08:38:56 +0000 |
| commit | 401f7fd234de9bec49c3ea602a14062cd0c81099 (patch) | |
| tree | 984b403068f322696dfcc7a7c60a92df61141d56 /docker | |
| parent | c814870f48d4a0cc349e7db157263fc60cdc75cf (diff) | |
| parent | 232cc372c3180319c7fd62be68e3340c955fe563 (diff) | |
| download | kolla-401f7fd234de9bec49c3ea602a14062cd0c81099.tar.gz kolla-401f7fd234de9bec49c3ea602a14062cd0c81099.zip | |
Merge "neutron-base: unify Debian/Ubuntu part"
Diffstat (limited to 'docker')
| -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 24e37c178..49f975021 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 %} |