openstack
/
kolla
Code Issues Proposed changes

Merge "Support VMware DVS"

This commit is contained in:
Jenkins 2017-06-27 10:05:48 +00:00 committed by Gerrit Code Review
parent e6a6024e98 388bad5cdc
commit 4c22fa52c8
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docker/neutron/neutron-base/Dockerfile.j2
View File

@ -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 = [

7
docker/neutron/neutron-server/Dockerfile.j2
View File

@ -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"'
] %}

8
kolla/common/config.py
View File

@ -488,6 +488,10 @@ SOURCES = {
'type': 'url',
'location': ('$tarballs_base/networking-generic-switch/'
'networking-generic-switch-master.tar.gz')},
'neutron-base-plugin-vmware-nsx': {
'type': 'url',
'location': ('$tarballs_base/vmware-nsx/'
'vmware-nsx-master.tar.gz')},
'neutron-bgp-dragent': {
'type': 'url',
'location': ('$tarballs_base/neutron-dynamic-routing/'
@ -520,10 +524,6 @@ SOURCES = {
'type': 'url',
'location': ('$tarballs_base/neutron-lbaas/'
'neutron-lbaas-master.tar.gz')},
'neutron-server-plugin-vmware-nsx': {
'type': 'url',
'location': ('$tarballs_base/vmware-nsx/'
'vmware-nsx-master.tar.gz')},
'neutron-server-plugin-vmware-nsxlib': {
'type': 'url',
'location': ('$tarballs_base/vmware-nsxlib/'