Wrong reference of Heat resource is set

[yatin]

File: magnum/drivers/common/templates/environments/disable_floating_ip.yaml

Wrong: Magnum::Optional::Neutron::Pool::FloatingIP --> This is changed with LBaaS v2
Correct: Magnum::Optional::Neutron::FloatingIP

References: https://review.openstack.org/#/c/337965 -- Make floating ip optional
            https://review.openstack.org/#/c/314060 -- Support LBaaS v2

Magnum::Optional::Neutron::FloatingIP should be converted to OS::Neutron::FloatingIP for enabling floating ip and converted to OS::Heat::None in case of disabling floating ip,

There are four cases:-
1. LB disabled, FIPs disabled
2. LB disabled, FIPs enabled
3. LB enabled, FIPs disabled
4. LB enabled, FIPs enabled

The order of import of environments is:- master_lb --> floating_ip
So, for case 3, it should be overridden in disable_floating_ip but disable_floating_ip contains wrong/non-exist reference(Magnum::Optional::Neutron::Pool::FloatingIP)

[yatin (yatinkarel)]

Fixed proposed to branch: stable/newton
https://review.openstack.org/#/c/382150/

In master will be fixed(with bug #1630189) with patch: https://review.openstack.org/#/c/382149/

[Spyros Trigazis (strigazi)]

Only case three is broken?

Does this affect the master branch and the stable/newton branch?

What it the expected output and what is the actual output?

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/newton
Review: https://review.openstack.org/393323

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/393323
Committed: https://git.openstack.org/cgit/openstack/magnum/commit/?id=93bd547631b24ebe98b2845721d6aa15fd81947d
Submitter: Jenkins
Branch: stable/newton

commit 93bd547631b24ebe98b2845721d6aa15fd81947d
Author: yatin <email address hidden>
Date: Thu Nov 3 19:12:56 2016 +0530

    Fix: k8s cluster creation with lb enabled/fip disabled

    Fixed creation of k8s cluster with enabled loadbalancer
    and disabled floating ip. This was caused because of wrong
    reference of heat resource in disable_floating_ip.yaml:-

    Wrong: Magnum::Optional::Neutron::Pool::FloatingIP
    Correct: Magnum::Optional::Neutron::FloatingIP

    Change-Id: I6ff1c43ab7f48b22b9f52ee09aa20284a28975b1
    Closes-Bug: #1630611

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/magnum 3.2.0 release.