swift-ring-builder needs to support replicator_id/port

[Dan Prince]

Using the latest upstream swift source code with puppet-swift I'm getting the following errors on subsequent (2nd... 3rd) puppet runs:

warning: Unexpected line: 0 1 2 127.0.0.1 6021 127.0.0.1 6021 2 1.00 262144 0.00
err: /Stage[main]//Swift::Storage::Node[2]/Ring_container_device[127.0.0.1:6021/2]/ensure: change from absent to present failed: Execution of '/usr/bin/swift-ring-builder /etc/swift/container.builder add z2-127.0.0.1:6021/2 1.00' returned 2: WARNING: No region specified for z2-127.0.0.1:6021/2. Defaulting to region 1.
Device 0 already uses 127.0.0.1:6021/2.
The on-disk ring builder is unchanged.

warning: Unexpected line: 0 1 2 127.0.0.1 6022 127.0.0.1 6022 2 1.00 262144 0.00
err: /Stage[main]//Swift::Storage::Node[2]/Ring_account_device[127.0.0.1:6022/2]/ensure: change from absent to present failed: Execution of '/usr/bin/swift-ring-builder /etc/swift/account.builder add z2-127.0.0.1:6022/2 1.00' returned 2: WARNING: No region specified for z2-127.0.0.1:6022/2. Defaulting to region 1.
Device 0 already uses 127.0.0.1:6022/2.
The on-disk ring builder is unchanged.

---

See Swift commit 959f5e7 (merged may 16th).

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/29814
Committed: http://github.com/stackforge/puppet-swift/commit/ee4a9d48599bce332d0d7bdf4f8c0bbb6d9c6f2e
Submitter: Jenkins
Branch: master

commit ee4a9d48599bce332d0d7bdf4f8c0bbb6d9c6f2e
Author: Dan Prince <email address hidden>
Date: Mon May 20 15:37:45 2013 -0400

    Update swift_ring_builder to support replicator...

    Updates swift_ring_builder rebalancing parsing to support the
    latest upstream replicator_id and replicator_port changes.

    This correspondes with swift 1.8+ upstream development.

    Fixes LP Bug #1182197.

    Change-Id: Ibbaf75ca22cad95b22f9b5f03b547db8c47a9ea4