From 4a9e30a0958094d1c471481d050dca09cd772f33 Mon Sep 17 00:00:00 2001
From: James Page <james.page@canonical.com>
Date: Tue, 22 Jan 2013 14:07:47 -0600
Subject: [PATCH] Add region name to quantum helpers

---
 files/create_ext_net.py               | 3 ++-
 files/create_tenant_net.py            | 6 ++++--
 hooks/nova-cloud-controller-relations | 1 +
 revision                              | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/files/create_ext_net.py b/files/create_ext_net.py
index aa4fcdcd..511d71f9 100755
--- a/files/create_ext_net.py
+++ b/files/create_ext_net.py
@@ -52,7 +52,8 @@ if __name__ == '__main__':
     quantum = client.Client(username=os.environ['OS_USERNAME'],
                             password=os.environ['OS_PASSWORD'],
                             tenant_name=os.environ['OS_TENANT_NAME'],
-                            auth_url=os.environ['OS_AUTH_URL'])
+                            auth_url=os.environ['OS_AUTH_URL'],
+                            region_name=os.environ['OS_REGION_NAME'])
 
     networks = quantum.list_networks(name=net_name)
     if len(networks['networks']) == 0:
diff --git a/files/create_tenant_net.py b/files/create_tenant_net.py
index 473e5d9b..24fb238b 100755
--- a/files/create_tenant_net.py
+++ b/files/create_tenant_net.py
@@ -57,11 +57,13 @@ if __name__ == '__main__':
     keystone = ks_client.Client(username=os.environ['OS_USERNAME'],
                                 password=os.environ['OS_PASSWORD'],
                                 tenant_name=os.environ['OS_TENANT_NAME'],
-                                auth_url=os.environ['OS_AUTH_URL'])
+                                auth_url=os.environ['OS_AUTH_URL'],
+                                region_name=os.environ['OS_REGION_NAME'])
     quantum = client.Client(username=os.environ['OS_USERNAME'],
                             password=os.environ['OS_PASSWORD'],
                             tenant_name=os.environ['OS_TENANT_NAME'],
-                            auth_url=os.environ['OS_AUTH_URL'])
+                            auth_url=os.environ['OS_AUTH_URL'],
+                            region_name=os.environ['OS_REGION_NAME'])
 
     # Resolve tenant id
     tenant_id = None
diff --git a/hooks/nova-cloud-controller-relations b/hooks/nova-cloud-controller-relations
index aad99887..ffdc735f 100755
--- a/hooks/nova-cloud-controller-relations
+++ b/hooks/nova-cloud-controller-relations
@@ -312,6 +312,7 @@ export OS_USERNAME=${service_username}
 export OS_PASSWORD=${service_password}
 export OS_TENANT_NAME=${service_tenant}
 export OS_AUTH_URL=${keystone_url}
+export OS_REGION_NAME=$region
 EOF
   fi
 
diff --git a/revision b/revision
index 485369e4..cd7da05e 100644
--- a/revision
+++ b/revision
@@ -1 +1 @@
-205
+210