cinder made compliant with mitaka

manifests/profile/cinder.pp

@@ -45,7 +45,8 @@ class iaas::profile::cinder (
     rabbit_hosts => suffix($rhosts, ':5672'),
     rabbit_userid => $rabbitmq_user,
     rabbit_password => $rabbitmq_password,
-    mysql_module => '2.3',
+#not in mitaka
+#    mysql_module => '2.3',
     database_idle_timeout => 3600,
   }
 
@@ -55,18 +56,33 @@ class iaas::profile::cinder (
 
   class { '::cinder::keystone::auth':
     password => $password,
-    public_address => $endpoint_main,
-    admin_address => $real_endpoint_admin,
-    internal_address => $real_endpoint_admin,
+#not in mitaka
+#    public_address => $endpoint_main,
+#    admin_address => $real_endpoint_admin,
+#    internal_address => $real_endpoint_admin,
+#mitaka
+    public_url => "http://${endpoint_admin}:8776/v1/%(tenant_id)s",
+    internal_url => "http://${real_endpoint_admin}:8776/v1/%(tenant_id)s",
+    admin_url => "http://${real_endpoint_admin}:8776/v1/%(tenant_id)s",
+    public_url_v2 => "http://${endpoint_admin}:8776/v2/%(tenant_id)s",
+    internal_url_v2 => "http://${real_endpoint_admin}:8776/v2/%(tenant_id)s",
+    admin_url_v2 => "http://${real_endpoint_admin}:8776/v2/%(tenant_id)s",
+    public_url_v3 => "http://${endpoint_admin}:8776/v3/%(tenant_id)s",
+    internal_url_v3 => "http://${real_endpoint_admin}:8776/v3/%(tenant_id)s",
+    admin_url_v3 => "http://${real_endpoint_admin}:8776/v3/%(tenant_id)s",
     region => $region,
   }
 
   class { '::cinder::api':
 #Identity_uri - planed to be implemented in Kilo
-    keystone_identity_uri => "http://${real_endpoint_admin}:35357",
+#not in mitaka
+#    keystone_identity_uri => "http://${real_endpoint_admin}:35357",
+#    keystone_auth_uri => "http://${endpoint_main}:5000/v2.0",
+#mitaka
+    identity_uri => "http://${real_endpoint_admin}:35357",
+    auth_uri => "http://${endpoint_main}:5000",
     keystone_auth_host => $real_endpoint_admin,
     keystone_password => $password,
-    keystone_auth_uri => "http://${endpoint_main}:5000/v2.0",
     bind_host => $::facts["ipaddress_${admin_interface}"],
   }