vmware nova-compute is not configured "vlan_interface" option when "VlanManager" (nova-network) is used

[Alexander Arzhanov]

Steps to reproduce:

1. Deploy cluster in Dualhypervisor mode with VLANManager(nova-network), VLAN interface - vmnic0.
2. Check option "vlan_interface" in vmware nova-compute configuration file.

Expected result:
vlan_interface=vmnic0

Actual result:
There is nothing

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/223655

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/7.0
Review: https://review.openstack.org/223659

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/6.1
Review: https://review.openstack.org/223661

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/223655
Committed: https://git.openstack.org/cgit/stackforge/fuel-library/commit/?id=230d8574e0c400609e8de57ad23a7398a33ba8dc
Submitter: Jenkins
Branch: master

commit 230d8574e0c400609e8de57ad23a7398a33ba8dc
Author: Alexander Arzhanov <email address hidden>
Date: Tue Sep 15 18:32:36 2015 +0300

    Fix vlan_interface option for VlanManager

    Add fix for compute-vmware and controller roles
    Add noop test for compute-vmware and controller roles

    Change-Id: Ieec93f663439701ca5b1a6ba627f7682f6f4a54b
    Closes-Bug: #1495949

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/7.0
Review: https://review.openstack.org/225108

[OpenStack Infra (hudson-openstack)]

Change abandoned by Alexander Arzhanov (<email address hidden>) on branch: stable/7.0
Review: https://review.openstack.org/223659

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/225108
Committed: https://git.openstack.org/cgit/stackforge/fuel-library/commit/?id=6efc6698dd3d4b07e90a97a49c702128ccc88de7
Submitter: Jenkins
Branch: stable/7.0

commit 6efc6698dd3d4b07e90a97a49c702128ccc88de7
Author: Alexander Arzhanov <email address hidden>
Date: Tue Sep 15 18:32:36 2015 +0300

    Fix vlan_interface option for VlanManager

    Add fix for compute-vmware and controller roles
    Add noop test for compute-vmware and controller roles

    Change-Id: Ieec93f663439701ca5b1a6ba627f7682f6f4a54b
    Closes-Bug: #1495949
    (cherry picked from commit 230d8574e0c400609e8de57ad23a7398a33ba8dc)

[Ilya Bumarskov (ibumarskov)]

Checked on Fuel 7.0 ISO #299

root@node-4:~# cat /etc/nova/nova-compute.d/vmware-vcenter_vm_cluster1.conf
[DEFAULT]
compute_driver=vmwareapi.VMwareVCDriver
log_file=nova-compute-vmware-vcenter-vm_cluster1.log
host=vcenter-vm_cluster1

[vmware]

cache_prefix=$host

cluster_name=Cluster1
host_ip=172.16.0.254
<email address hidden>
host_password=Qwer!1234

api_retry_count=5
maximum_objects=100
task_poll_interval=5.0
datastore_regex=.*
vlan_interface=vmnic1
use_linked_clone=true

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/223661
Committed: https://git.openstack.org/cgit/stackforge/fuel-library/commit/?id=19db57f9f68bc0402b98cd06c6f90f9049a5bf99
Submitter: Jenkins
Branch: stable/6.1

commit 19db57f9f68bc0402b98cd06c6f90f9049a5bf99
Author: Alexander Arzhanov <email address hidden>
Date: Tue Sep 15 18:52:50 2015 +0300

    Fix vlan_interface option for VlanManager

    Change-Id: Ieac9c02f0cb88e58126a548b02bec0e12cb0da07
    Closes-Bug: #1495949

[Vitaly Sedelnik (vsedelnik)]

Reassigned to Alexey Khivin to create release notes entry for MOS 6.1 MU 3