Can't re-deploy old cluster after upgrade - get message Error 'neutron_mellanox'

[Andrey Sledzinskiy]

{

    "build_id": "2014-07-22_14-59-42",
    "ostf_sha": "c1b60d4bcee7cd26823079a86e99f3f65414498e",
    "build_number": "63",
    "auth_required": false,
    "api": "1.0",
    "nailgun_sha": "e4e26cd1e652df2bb2285b31cafd633358a80b59",
    "production": "docker",
    "fuelmain_sha": "fa0eb43ae5e9acc965e5f687a83f389d9e71418c",
    "astute_sha": "fd9b8e3b6f59b2727b1b037054f10e0dd7bd37f1",
    "feature_groups": [
        "mirantis"
    ],
    "release": "5.1",
    "fuellib_sha": "c9357718407a81d95acc131e5f8ea9b7c4162d30"

}

Steps:
1. Install fuel from 5.0-26 ISO
2. Create and deploy simple cluster with default values - 1 controller, 1 compute, 1 cinder node
3. After deployment upload upgrade script to master and run upgrade
4. After successful upgrade add 1 compute node to existing cluster and run deployment

Expected - deployment is successful
Actual - get error Error 'neutron_mellanox'
Error in Web Backend log:
[7f8c33557740] (manager) Traceback (most recent call last):
  File "/usr/lib/python2.6/site-packages/nailgun/task/manager.py", line 47, in _call_silently
    return method(task, *args, **kwargs)
  File "/usr/lib/python2.6/site-packages/nailgun/task/task.py", line 195, in message
    task.cluster, nodes_to_provisioning)
  File "/usr/lib/python2.6/site-packages/nailgun/orchestrator/provisioning_serializers.py", line 189, in serialize
    return ProvisioningSerializer.serialize(cluster, nodes)
  File "/usr/lib/python2.6/site-packages/nailgun/orchestrator/provisioning_serializers.py", line 36, in serialize
    serialized_nodes = cls.serialize_nodes(cluster_attrs, nodes)
  File "/usr/lib/python2.6/site-packages/nailgun/orchestrator/provisioning_serializers.py", line 52, in serialize_nodes
    serialized_node = cls.serialize_node(cluster_attrs, node)
  File "/usr/lib/python2.6/site-packages/nailgun/orchestrator/provisioning_serializers.py", line 60, in serialize_node
    mlnx_num_of_vf = cluster_attrs['neutron_mellanox']['vf_num']
KeyError: 'neutron_mellanox'

Logs are attached

[OpenStack Infra (hudson-openstack)]

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

[Tatyanka (tatyana-leontovich)]

Affect updates testing to for case
deploy 5.0.1-create cluster A- upgrade to 5.1(master node) - reset cluster A - try to deploy
deploy 5.0.1 upgrade to 5.1(master node) - try to create cluster

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/109028
Committed: https://git.openstack.org/cgit/stackforge/fuel-web/commit/?id=e05c70eba2c0e346e078da8cc9857b338dea8dd3
Submitter: Jenkins
Branch: master

commit e05c70eba2c0e346e078da8cc9857b338dea8dd3
Author: Aleksey Kasatkin <email address hidden>
Date: Wed Jul 23 18:56:03 2014 +0300

    Check presence of neutron_mellanox metadata section before its use

    Closes-Bug: #1347486

    Change-Id: I455fd8c141caf1ea114f57646baf754164a8d9f9

[Andrey Sledzinskiy (asledzinskiy)]

verified on
{

    "build_id": "2014-08-01_15-37-04",
    "ostf_sha": "061b999c014db816c2da12546dcff1ae3a5a6ec0",
    "build_number": "87",
    "auth_required": true,
    "api": "1.0",
    "nailgun_sha": "3a67c786f5a07b5c2597c0649247c6a9db6c0185",
    "production": "docker",
    "fuelmain_sha": "7990f5bfa7fea5b74ebf0402b1918109b9bc505b",
    "astute_sha": "5a93fa8f9abbc087ee1c9cca894d781a03167094",
    "feature_groups": [
        "mirantis"
    ],
    "release": "5.1",
    "fuellib_sha": "004ab7ed0e6e4268f3657d47836d3629f339bd9a"

}