swift pollster adds '/v1' to adminURL

[You Yamagata]

Swift pollster (ceilometer.objstore.swift.SwiftPollster) adds '/v1' string to adminURL in iter_accounts method.
But according to the grizzly install document, adminURL has '/v1'.
As result , pollster can't get tenant list as follows.

-----
May 24 17:10:39 saio03 2013-05-24 17:10:39 ERROR [ceilometer.central.manager] Account HEAD failed: http://10.10.10.193:8080/v1/v1/AUTH_0db29431e401447fa8d9cea982dc4341 404 Not Found#012Traceback (most recent call last):#012 File "/usr/lib/python2.7/dist-packages/ceilometer/central/manager.py", line 50, in poll_and_publish#012 self.manager)))#012 File "/usr/lib/python2.7/dist-packages/ceilometer/objectstore/swift.py", line 57, in get_counters#012 for tenant, account in self.iter_accounts(manager.keystone):#012 File "/usr/lib/python2.7/dist-packages/ceilometer/objectstore/swift.py", line 116, in iter_accounts#012 ksclient.auth_token))#012 File "/usr/lib/python2.7/dist-packages/swiftclient/client.py", line 415, in head_account#012 http_response_content=body)#012ClientException: Account HEAD failed: http://10.10.10.193:8080/v1/v1/AUTH_0db29431e401447fa8d9cea982dc4341 404 Not Found
-----

OpenStack Install and Deploy Manual - Ubuntu - Grizzly, 2013.1 (Object Storage 1.8.0)
Creating keystone services and service endpoints
http://docs.openstack.org/grizzly/openstack-compute/install/apt/content/keystone-service-endpoint-create.html

[xingzhou (xingzhou)]

Ceilometer shall have a check of the endpoint queried from Keystone, if it contains v1 in the path already, shall change the url generation pattern.

[gordon chung (chungg)]

duplicate of Bug #1177374 i believe

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/31169
Committed: http://github.com/openstack/ceilometer/commit/3d4d078e51f061f99a6daa474c5640c155af2baa
Submitter: Jenkins
Branch: master

commit 3d4d078e51f061f99a6daa474c5640c155af2baa
Author: xingzhou <email address hidden>
Date: Fri May 31 04:04:47 2013 -0400

    Ceilometer may generate wrong format swift url in some situations

    Ceilometer uses the admin URL registered in keystone to poll object store.
    Usually the url is like: http://<host>:<port>, in some cases, user might
    register the url like: http://<host>:<port>/v1
    Ceilometer shall get the url registered in keystone and populate it to the
    http://<host>:<port>/v1/AUTH_%(tenant_id)s style

    Change the url population process the enhance the fault-tolerant capability
    of Ceilometer

    Change-Id: I3ec6ab0c330e35a2fd6bab36b8a2f43aee883b6d
    Fixes: Bug 1183704