template argument is ignored in get_injected_network_template

[Mathieu Gagné]

The template argument in get_injected_network_template is always ignored.

See:
https://github.com/openstack/nova/blob/2015.1.0b3/nova/virt/netutils.py#L84-L85
And:
https://github.com/openstack/nova/blob/2015.1.0b3/nova/virt/netutils.py#L164

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/171847
Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=4da91eb43d78b88bcaa16aac36a3c3b5cf737cad
Submitter: Jenkins
Branch: master

commit 4da91eb43d78b88bcaa16aac36a3c3b5cf737cad
Author: Mathieu Gagné <email address hidden>
Date: Wed Apr 8 18:28:54 2015 -0400

    Don't ignore template argument in get_injected_network_template

    Use previously detected template file (in template variable)
    instead of CONF.injected_network_template.

    Existing detection logic is fine:
    * If template argument is defined, it is used.
    * If template argument is None, CONF.injected_network_template is used.

    Change-Id: I77385bfb2d79be34aed476ed4840fe03c59ed7df
    Closes-bug: #1441892