puppet-cinder duplicate resource error

[craig]

when using multiple ceph backends with different rbd_users the run fails with a duplicate resource on the ensure_resource file_line

[OpenStack Infra (hudson-openstack)]

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

[craig (craig-delatte)]

Error: Could not retrieve catalog from remote server: Error 400 on SERVER: Evaluation Error: Error while evaluating a Function Call, Duplicate declaration: File_line[set initscript env] is already declared; cannot redeclare at /etc/puppet/environments/production/modules/cinder/manifests/backend/rbd.pp:109:3

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/258206
Committed: https://git.openstack.org/cgit/openstack/puppet-cinder/commit/?id=3c4628281153a0ea0c6f2e713242f109ec3af83b
Submitter: Jenkins
Branch: master

commit 3c4628281153a0ea0c6f2e713242f109ec3af83b
Author: Matt Fischer <email address hidden>
Date: Tue Dec 15 14:38:31 2015 -0700

    Fix multiple rbd backend with multiple users

    If you have multiple rbd backends and each uses a different value for
    rbd_user you will get a duplicate resource. This solves that. There's no
    need for an ensure_resource line, just a unique name on the file_line is
    enough.

    Closes-Bug: #1526533

    Change-Id: I638630ce89fa332539aee03e6dd3057b36f78670

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/liberty
Review: https://review.openstack.org/258729

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/258729
Committed: https://git.openstack.org/cgit/openstack/puppet-cinder/commit/?id=54cd5fdee50e05dab937ecac1c52588cccbf82c1
Submitter: Jenkins
Branch: stable/liberty

commit 54cd5fdee50e05dab937ecac1c52588cccbf82c1
Author: Matt Fischer <email address hidden>
Date: Tue Dec 15 14:38:31 2015 -0700

    Fix multiple rbd backend with multiple users

    If you have multiple rbd backends and each uses a different value for
    rbd_user you will get a duplicate resource. This solves that. There's no
    need for an ensure_resource line, just a unique name on the file_line is
    enough.

    Closes-Bug: #1526533

    Change-Id: I638630ce89fa332539aee03e6dd3057b36f78670
    (cherry picked from commit 3c4628281153a0ea0c6f2e713242f109ec3af83b)

[Doug Hellmann (doug-hellmann)]

This issue was fixed in the openstack/puppet-cinder 7.1.0 release.