From 388bad5cdc6b119d407428514f284fc7614444c3 Mon Sep 17 00:00:00 2001
From: jimmygc <guochao@winhong.com>
Date: Wed, 31 May 2017 11:23:25 +0800
Subject: [PATCH] Support VMware DVS

Move vmware_nsx and oslo.vmware to neutron_base image to
 support this change: I6d1629e93f0efeddd2a9000f66cc6f714bebb07c

Change-Id: I4655086a3f058ec769d3d37ec6a19565b5ea0841
Partially-implements: blueprint kolla-ansible-support-vsphere
---
 docker/neutron/neutron-base/Dockerfile.j2   | 12 ++++++++----
 docker/neutron/neutron-server/Dockerfile.j2 |  7 ++-----
 kolla/common/config.py                      |  8 ++++----
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2
index c2e97aa45c..adb3ec4fa7 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'] %}
@@ -31,7 +32,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'] %}
@@ -43,7 +45,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 %}
@@ -97,7 +100,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 9790414166..004474c50d 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"'
     ] %}
 
diff --git a/kolla/common/config.py b/kolla/common/config.py
index b7bd8dc301..55077a38de 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -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/'