Merge "Add vSphere Support"

3 files changed, 36 insertions, 5 deletions

diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2
index 05b65f7a8..195668cca 100644
--- a/docker/neutron/neutron-server/Dockerfile.j2
+++ b/docker/neutron/neutron-server/Dockerfile.j2
@@ -11,6 +11,7 @@ MAINTAINER {{ maintainer }}
         {% set neutron_server_packages = [
             'openstack-neutron-lbaas',
             'openstack-neutron-vpnaas',
+            'python-oslo-vmware'
         ] %}
 
     {% elif base_distro in ['ubuntu'] %}
@@ -19,13 +20,23 @@ MAINTAINER {{ maintainer }}
             'neutron-lbaasv2-agent',
             'python-neutron-lbaas',
             'python-neutron-vpnaas',
+            'python-oslo-vmware'
         ] %}
 
     {% endif %}
-{% endif %}
 
 {{ macros.install_packages(neutron_server_packages | customizable("packages")) }}
 
+{% elif install_type == 'source' %}
+
+    {% set neutron_server_pip_packages = [
+            'oslo-vmware'
+    ] %}
+
+RUN {{ macros.install_pip(neutron_server_pip_packages | customizable("pip_packages")) }}
+
+{% endif %}
+
 ADD plugins-archive /
 
 {% set neutron_server_plugins_pip_packages = [
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2
index 164abf83e..5963b1593 100644
--- a/docker/nova/nova-compute/Dockerfile.j2
+++ b/docker/nova/nova-compute/Dockerfile.j2
@@ -17,7 +17,8 @@ MAINTAINER {{ maintainer }}
             'openvswitch',
             'python-rtslib',
             'sysfsutils',
-            'targetcli'
+            'targetcli',
+            'python-oslo-vmware'
         ] %}
 
 {{ macros.install_packages(nova_compute_packages | customizable("packages")) }}
@@ -36,7 +37,8 @@ MAINTAINER {{ maintainer }}
             'python-ironicclient',
             'python-rtslib',
             'sysfsutils',
-            'targetcli'
+            'targetcli',
+            'python-oslo-vmware'
         ] %}
 
 {{ macros.install_packages(nova_compute_packages | customizable("packages")) }}
@@ -84,7 +86,8 @@ RUN mkdir -p /etc/ceph
 {{ macros.install_packages(nova_compute_packages | customizable("packages")) }}
 
 {% set nova_compute_pip_packages = [
-        'libvirt-python'
+        'libvirt-python',
+        'oslo-vmware'
     ]
 %}
 
@@ -92,9 +95,18 @@ RUN {{ macros.install_pip(nova_compute_pip_packages | customizable("pip_packages
 
 {% endif %}
 
+ADD plugins-archive /
+
+{% set nova_compute_plugins_pip_packages = [
+    '/plugins/*'
+] %}
+
 COPY extend_start.sh /usr/local/bin/kolla_nova_extend_start
 RUN chmod 755 /usr/local/bin/kolla_nova_extend_start \
-    && rm -f /etc/machine-id
+    && rm -f /etc/machine-id \
+    && if [ "$(ls /plugins)" ]; then \
+           {{ macros.install_pip(nova_compute_plugins_pip_packages | customizable("pip_packages")) }}; \
+       fi
 
 ENV PATH $PATH:/lib/udev
 
diff --git a/kolla/common/config.py b/kolla/common/config.py
index e5a3cedfa..2c8eb8e00 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -465,6 +465,14 @@ 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/'
+                     'vmware-nsxlib-master.tar.gz')},
     'neutron-server-plugin-vpnaas-agent': {
         'type': 'url',
         'location': ('$tarballs_base/neutron-vpnaas/'