c06f79f3a1
That's only prototype not ready to use plugin. It devoid a lot of things and has only mock instead puppet's manifest. But it enough for installation and deployment. QA can start checking. Change-Id: I93cf2025cc5a9477443bdc97e3dc0da6166db972
31 lines
1.3 KiB
Diff
31 lines
1.3 KiB
Diff
diff --git a/nova/virt/vmwareapi/vif.py b/nova/virt/vmwareapi/vif.py
|
|
index 3d228d7..d513a74 100644
|
|
--- a/nova/virt/vmwareapi/vif.py
|
|
+++ b/nova/virt/vmwareapi/vif.py
|
|
@@ -155,6 +155,10 @@ def get_network_ref(session, cluster, vif, is_neutron):
|
|
network_name = (vif['network']['bridge'] or
|
|
CONF.vmware.integration_bridge)
|
|
network_ref = get_neutron_network(session, network_name, cluster, vif)
|
|
+ try:
|
|
+ network_ref['dvs_port_key']=vif['details']['dvs_port_key']
|
|
+ except KeyError:
|
|
+ pass
|
|
else:
|
|
create_vlan = vif['network'].get_meta('should_create_vlan', False)
|
|
network_ref = ensure_vlan_bridge(session, vif, cluster=cluster,
|
|
diff --git a/nova/virt/vmwareapi/vm_util.py b/nova/virt/vmwareapi/vm_util.py
|
|
index bbf2835..be68010 100644
|
|
--- a/nova/virt/vmwareapi/vm_util.py
|
|
+++ b/nova/virt/vmwareapi/vm_util.py
|
|
@@ -339,6 +339,10 @@ def _create_vif_spec(client_factory, vif_info):
|
|
'ns0:DistributedVirtualSwitchPortConnection')
|
|
portgroup.switchUuid = network_ref['dvsw']
|
|
portgroup.portgroupKey = network_ref['dvpg']
|
|
+ try:
|
|
+ portgroup.portKey = network_ref['dvs_port_key']
|
|
+ except KeyError:
|
|
+ pass
|
|
backing.port = portgroup
|
|
else:
|
|
backing = client_factory.create(
|