Wrong default is used for ISCSI portal port number in get_deploy_info

[Vladyslav Drok]

Here is a piece of code from iscsi_deploy.py get_deploy_info function

    params = {
        'address': kwargs.get('address'),
        'port': kwargs.get('port', '3260'),
        'iqn': kwargs.get('iqn'),
        'lun': kwargs.get('lun', '1'),
        'image_path': _get_image_file_path(node.uuid),
        'node_uuid': node.uuid}

As port does not get passed here from do_agent_iscsi_deploy:

    iscsi_params = {'error': result['command_error'],
                    'iqn': iqn,
                    'key': iscsi_options['deployment_key'],
                    'address': address}

We're using a wrong '3260' default, we should use CONF.iscsi.portal_port instead.

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

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

commit cc54cea0605527723a3c67e64867b17cad8e8ada
Author: Vladyslav Drok <email address hidden>
Date: Wed May 25 21:01:20 2016 +0300

    Use correct iscsi portal port in continue_deploy

    We should set it to CONF.iscsi.portal_port by default.

    Closes-Bug: #1585731

    Change-Id: I34e1f2ff842b323fb390f16cca32309fb64cfea3

[Thierry Carrez (ttx)]

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