diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-06-27 10:05:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-06-27 10:05:48 +0000 |
| commit | 4c22fa52c8a4b0bc8d0b83df33ea7f38956e1772 (patch) | |
| tree | 49edbb5788cd6c788a42890bfd3987024dd8e757 /docker | |
| parent | e6a6024e98a570daeee27be0d641f84abb38ab0c (diff) | |
| parent | 388bad5cdc6b119d407428514f284fc7614444c3 (diff) | |
| download | kolla-4c22fa52c8a4b0bc8d0b83df33ea7f38956e1772.tar.gz kolla-4c22fa52c8a4b0bc8d0b83df33ea7f38956e1772.zip | |
Merge "Support VMware DVS"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/neutron/neutron-base/Dockerfile.j2 | 12 | ||||
| -rw-r--r-- | docker/neutron/neutron-server/Dockerfile.j2 | 7 |
2 files changed, 10 insertions, 9 deletions
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index 6382661ad..01ca2f4dd 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -20,7 +20,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'openstack-neutron-lbaas', 'openstack-neutron-ml2', 'openvswitch', - 'python-openvswitch' + 'python-openvswitch', + 'python2-oslo-vmware' ] %} {% elif base_distro in ['debian'] %} @@ -32,7 +33,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'neutron-plugin-ml2', 'neutron-server', 'openvswitch-switch', - 'python-openvswitch' + 'python-openvswitch', + 'python-oslo.vmware' ] %} {% elif base_distro in ['ubuntu'] %} @@ -45,7 +47,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'neutron-plugin-ml2', 'neutron-server', 'openvswitch-switch', - 'python-openvswitch' + 'python-openvswitch', + 'python-oslo.vmware' ] %} {% endif %} @@ -100,7 +103,8 @@ ADD neutron-base-archive /neutron-base-source ADD plugins-archive / {% set neutron_base_pip_packages = [ - '/neutron' + '/neutron', + 'oslo-vmware' ] %} {% set neutron_base_plugins_pip_packages = [ diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2 index 979041416..004474c50 100644 --- a/docker/neutron/neutron-server/Dockerfile.j2 +++ b/docker/neutron/neutron-server/Dockerfile.j2 @@ -10,8 +10,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set neutron_server_packages = [ 'openstack-neutron-lbaas', - 'openstack-neutron-vpnaas', - 'python-oslo-vmware' + 'openstack-neutron-vpnaas' ] %} {% elif base_distro in ['debian', 'ubuntu'] %} @@ -19,8 +18,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set neutron_server_packages = [ 'neutron-lbaasv2-agent', 'python-neutron-lbaas', - 'python-neutron-vpnaas', - 'python-oslo.vmware' + 'python-neutron-vpnaas' ] %} {% endif %} @@ -30,7 +28,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% elif install_type == 'source' %} {% set neutron_server_pip_packages = [ - 'oslo-vmware', '"networking-hyperv<=4.0.0"' ] %} |