Use the cinder v1 apis until client bug fixed.

Change-Id: Ie0fa4444d926516b61eb5b636b4986f1607521f1

anvil/components/helpers/cinder.py

@@ -16,20 +16,25 @@
 
 from anvil import utils
 
+# v1 seems correct until bug 1190331 is fixed
+# where the cinderclient doesn't seem to know anything
+# beyond v1 unless told.
+VERSION = "v1"
+
+
 def get_shared_params(ip, api_host, api_port=8776, protocol='http', **kwargs):
     mp = {}
     mp['service_host'] = ip
 
     # Uri's of the various cinder endpoints
     mp['endpoints'] = {
-        'volume': {
-            'uri': utils.make_url(protocol, api_host, api_port, "v2"),
+        'admin': {
+            'uri': utils.make_url(protocol, api_host, api_port, VERSION),
             'port': api_port,
             'host': api_host,
             'protocol': protocol,
         },
-        'internal': {
-        }
     }
-
+    mp['endpoints']['internal'] = dict(mp['endpoints']['admin'])
+    mp['endpoints']['public'] = dict(mp['endpoints']['admin'])
     return mp

conf/templates/keystone/init_what.yaml

@@ -25,9 +25,9 @@ endpoints:
     public_url: "$glance.endpoints.public.uri"
     region: RegionOne
 -   service: volume
-    admin_url: "${cinder.endpoints.volume.uri}/%(tenant_id)s"
-    internal_url: "${cinder.endpoints.volume.uri}/%(tenant_id)s"
-    public_url: "${cinder.endpoints.volume.uri}/%(tenant_id)s"
+    admin_url: "${cinder.endpoints.admin.uri}/%(tenant_id)s"
+    internal_url: "${cinder.endpoints.internal.uri}/%(tenant_id)s"
+    public_url: "${cinder.endpoints.public.uri}/%(tenant_id)s"
     region: RegionOne
 -   service: s3
     admin_url: "$nova.endpoints.s3.uri"