Changing of workloads collector tenant or user name fails re-deploy

[Alexander Kurenyshev]

Steps to reproduce:
1) Create a cluster
2) Deploy the cluster
3) Change a workloads collector tenant and/or workloads user name
4) Redeploy the cluster

Expected result:
Redeploy passed

Actual result:
Deploy failed with: Deployment has failed. All nodes are finished. Failed tasks: Task[workloads_collector_add/2] Stopping the deployment process!

[root@nailgun ~]# shotgun2 short-report
cat /etc/fuel_build_id:
 416
cat /etc/fuel_build_number:
 416
cat /etc/fuel_release:
 9.0
cat /etc/fuel_openstack_version:
 mitaka-9.0
rpm -qa | egrep 'fuel|astute|network-checker|nailgun|packetary|shotgun':
 fuel-release-9.0.0-1.mos6347.noarch
 fuel-bootstrap-cli-9.0.0-1.mos284.noarch
 fuel-migrate-9.0.0-1.mos8398.noarch
 rubygem-astute-9.0.0-1.mos746.noarch
 fuel-provisioning-scripts-9.0.0-1.mos8709.noarch
 network-checker-9.0.0-1.mos72.x86_64
 fuel-mirror-9.0.0-1.mos137.noarch
 fuel-openstack-metadata-9.0.0-1.mos8709.noarch
 fuel-notify-9.0.0-1.mos8398.noarch
 nailgun-mcagents-9.0.0-1.mos746.noarch
 python-fuelclient-9.0.0-1.mos316.noarch
 fuelmenu-9.0.0-1.mos270.noarch
 fuel-9.0.0-1.mos6347.noarch
 fuel-utils-9.0.0-1.mos8398.noarch
 fuel-setup-9.0.0-1.mos6347.noarch
 fuel-library9.0-9.0.0-1.mos8398.noarch
 shotgun-9.0.0-1.mos90.noarch
 fuel-agent-9.0.0-1.mos284.noarch
 fuel-ui-9.0.0-1.mos2706.noarch
 fuel-ostf-9.0.0-1.mos934.noarch
 fuel-misc-9.0.0-1.mos8398.noarch
 python-packetary-9.0.0-1.mos137.noarch
 fuel-nailgun-9.0.0-1.mos8709.noarch

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/324645
Committed: https://git.openstack.org/cgit/openstack/fuel-library/commit/?id=b6ebeffbc87f60f8dc6c81a60b54c8d5521924b8
Submitter: Jenkins
Branch: master

commit b6ebeffbc87f60f8dc6c81a60b54c8d5521924b8
Author: Oleksiy Molchanov <email address hidden>
Date: Thu Jun 2 19:10:06 2016 +0300

    Add tenant when running workloads_collector_add

    Change-Id: Idef0c10310483ae9895e088a3d40b1a1cd4a2f46
    Closes-Bug: 1587912

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/mitaka
Review: https://review.openstack.org/325785

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/325785
Committed: https://git.openstack.org/cgit/openstack/fuel-library/commit/?id=e84ce0c9ac056f9fd1317ffd90d3e391f8c3135d
Submitter: Jenkins
Branch: stable/mitaka

commit e84ce0c9ac056f9fd1317ffd90d3e391f8c3135d
Author: Oleksiy Molchanov <email address hidden>
Date: Thu Jun 2 19:10:06 2016 +0300

    Add tenant when running workloads_collector_add

    Change-Id: Idef0c10310483ae9895e088a3d40b1a1cd4a2f46
    Closes-Bug: 1587912
    (cherry picked from commit b6ebeffbc87f60f8dc6c81a60b54c8d5521924b8)

[Ekaterina Shutova (eshutova)]

Used steps from description.
Redeploy completed successfully.
Verified on:
[root@nailgun /]# shotgun2 short-report
cat /etc/fuel_build_id:
 467
cat /etc/fuel_build_number:
 467
cat /etc/fuel_release:
 9.0
cat /etc/fuel_openstack_version:
 mitaka-9.0