Adoption feature has incorrect logic in conductor

[Julia Kreger]

Adoption originally fired ramdisk preparation, when in reality it should call instance preparation. End behavior is similar, validation is the same. Additionally, the documentation needs to be updated to reflect networking changes, and what is required to bypass any attempt to setup TFTP infrastructure, depending on the boot mode, which could be problematic for users.

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/344973
Committed: https://git.openstack.org/cgit/openstack/ironic/commit/?id=f95be90248ff64cb37cd0e2dbe220719c1df346c
Submitter: Jenkins
Branch: master

commit f95be90248ff64cb37cd0e2dbe220719c1df346c
Author: Julia Kreger <email address hidden>
Date: Wed Jul 20 14:00:11 2016 -0400

    Bug fixes and doc updates for adoption

    During the creation of a tempest test for the adoption feature,
    some minor issues were identified with the adoption functionality.

    Namely, the default logic was to create ramdisks, however that logic
    path is more intended for deployment ramdisks. Logic was switched
    to the instance preparation logic which is the default for nodes in
    active state, which is realistically exactly what is desired.

    Validation behavior ultimately remains unchanged and tests were
    added to validate that the expected methods are called.

    Additionally, it was identified that it would be ideal to
    encourage the user to set the node to local boot, and as
    such the documentation was updated as part of this change,
    coupled with a note mentioning changes in API version 1.20
    that a user may wish to leverage.

    Change-Id: Id6053e0fa68deb431f4543005421982c795401f2
    Closes-Bug: #1605239

[Davanum Srinivas (DIMS) (dims-v)]

This issue was fixed in the openstack/ironic 6.1.0 release.