environment is not honoured when using template resources

[Angus Salkeld]

If you have the following in your environment:

resource_registry:
  OS::Nova::Server: other.yaml
  resources:
    a_res:
      OS::Nova::Server: my.yaml

Then when the stack is created "a_res" will be created with other.yaml instead of my.yaml

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/153551
Committed: https://git.openstack.org/cgit/openstack/heat/commit/?id=92669014ea5729c137e18751b97ab14229c65b0e
Submitter: Jenkins
Branch: master

commit 92669014ea5729c137e18751b97ab14229c65b0e
Author: Angus Salkeld <email address hidden>
Date: Fri Feb 6 22:22:43 2015 +1000

    Pass the resource name into get_resource_info()

    Problem
    If you have the following in the environment, the resource "a_res" will
    be created with "other.yaml" instead of "my.yaml".

    resource_registry:
      resources:
        a_res:
          OS::Nova::Server: my.yaml
      OS::Nova::Server: other.yaml

    The reason for this is that the resource name has not been passed into
    get_resource_info().

    Note: a functional test is coming in a later commit.

    Closes-bug: 1418935
    Change-Id: I45a453ac342eab287544fc9d4f94e9bd5716bb8e

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/juno
Review: https://review.openstack.org/244957

[OpenStack Infra (hudson-openstack)]

Change abandoned by Crag Wolfe (<email address hidden>) on branch: stable/juno
Review: https://review.openstack.org/244957

[OpenStack Infra (hudson-openstack)]

Change abandoned by Jeremy Stanley (<email address hidden>) on branch: stable/juno
Review: https://review.openstack.org/244957
Reason: I'm abandoning this change in preparation for deleting the stable/juno branch, which is now at end of life.