brocade ml2 mechanism driver depends on templates of brocade plugin

[Shiv Haris]

Brocade ml2 mechanism driver includes templates from the brocade plugin directory.

If the brocade plugin is not installed on a system then this file inclusion will fail for the md.

This was an unfortunate typo, the fix is:

--- INDEX:/neutron/plugins/ml2/drivers/brocade/nos/nosdriver.py
+++ WORKDIR:/neutron/plugins/ml2/drivers/brocade/nos/nosdriver.py
@@ -26,7 +26,7 @@ from ncclient import manager

 from neutron.openstack.common import excutils
 from neutron.openstack.common import log as logging
-from neutron.plugins.brocade.nos import nctemplates as template
+from neutron.plugins.ml2.drivers.brocade.nos import nctemplates as template

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Change abandoned by Shiv Haris (<email address hidden>) on branch: master
Review: https://review.openstack.org/101674
Reason: temporary set aside

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/icehouse
Review: https://review.openstack.org/101760

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/99234
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=2efc40ba6b63f8ad1c2e1c98b562012fa1154ed5
Submitter: Jenkins
Branch: master

commit 2efc40ba6b63f8ad1c2e1c98b562012fa1154ed5
Author: Shiv Haris <email address hidden>
Date: Tue Jun 10 16:28:00 2014 -0700

    Brocade mechanism driver depends on the brocade plugin templates

    This causes problems when the customer installs the ml2
    plugin/mechanism driver without the Brocade plugin.

    Fixes bug: #1326937

    Change-Id: I2d0dfda2cdfbdfd8503351b191151cb02104dcce

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/101760
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=33992c81667a93435d362addff8f598786600d21
Submitter: Jenkins
Branch: stable/icehouse

commit 33992c81667a93435d362addff8f598786600d21
Author: Shiv Haris <email address hidden>
Date: Tue Jun 10 16:28:00 2014 -0700

    Brocade mechanism driver depends on the brocade plugin templates

    This causes problems when the customer installs the ml2
    plugin/mechanism driver without the Brocade plugin.

    Fixes bug: #1326937

    Change-Id: I2d0dfda2cdfbdfd8503351b191151cb02104dcce
    (cherry picked from commit 2efc40ba6b63f8ad1c2e1c98b562012fa1154ed5)