From 13c6c40998722819595568f3a633623c7bd674f0 Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Mon, 7 Dec 2015 11:47:24 +0000
Subject: [PATCH] Fix name of *_tenant_id var passed back from keystone

---
 requires.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/requires.py b/requires.py
index 0909484..b48d7ac 100644
--- a/requires.py
+++ b/requires.py
@@ -23,8 +23,8 @@ class KeystoneRequires(RelationBase):
     # with a basic documentation string provided.
     auto_accessors = ['private-address', 'service_host', 'service_protocol',
                       'service_port', 'service_tenant', 'service_username',
-                      'service_password', 'auth_host', 'auth_protocol',
-                      'auth_port', 'admin_tenant_id']
+                      'service_password', 'service_tenant_id', 'auth_host',
+                      'auth_protocol', 'auth_port']
 
     @hook('{requires:keystone}-relation-joined')
     def joined(self):
@@ -54,14 +54,16 @@ class KeystoneRequires(RelationBase):
                 return False
         return True
 
-    def register_endpoints(self, public_url, internal_url, admin_url):
+    def register_endpoints(self, service, region, public_url, internal_url, admin_url):
         """
         Register this service with keystone
         """
         relation_info = {
+            'service': service,
             'public_url': public_url,
             'internal_url': internal_url,
             'admin_url': admin_url,
+            'region': region,
         }
         self.set_local(**relation_info)
         self.set_remote(**relation_info)