From c785da53b43e033031902258ca0f24c48f4d594d Mon Sep 17 00:00:00 2001
From: Carlos Konstanski <ckonstanski@pippiandcarlos.com>
Date: Thu, 14 Dec 2017 16:00:35 -0700
Subject: OS_REGION -> OS_REGION_NAME

---
 glance-gateway.py   | 10 +++++-----
 image-foundry.py    |  8 ++++----
 libs/environment.py |  8 ++++----
 libs/keystone.py    |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/glance-gateway.py b/glance-gateway.py
index 53b1708..c964eb0 100755
--- a/glance-gateway.py
+++ b/glance-gateway.py
@@ -33,7 +33,7 @@ def read_manifests(env):
 def main(args):
     env_src = Environment(args.os_auth_url,
                           args.os_project_name,
-                          args.os_region,
+                          args.os_region_name,
                           args.os_username,
                           args.os_password,
                           args.os_project_domain_name,
@@ -66,7 +66,7 @@ def main(args):
                 # upload image as public
                 env_dest = Environment(region["connectionUrl"],
                                        args.os_project_name,
-                                       args.os_region,
+                                       args.os_region_name,
                                        args.os_username,
                                        args.os_password,
                                        args.os_project_domain_name,
@@ -99,10 +99,10 @@ if __name__ == "__main__":
                         required=False,
                         default=os.environ.get("OS_PROJECT_NAME", None),
                         help="OpenStack openrc environment variable: OS_PROJECT_NAME")
-    parser.add_argument("--os-region",
+    parser.add_argument("--os-region-name",
                         required=False,
-                        default=os.environ.get("OS_REGION", None),
-                        help="OpenStack openrc environment variable: OS_REGION")
+                        default=os.environ.get("OS_REGION_NAME", None),
+                        help="OpenStack openrc environment variable: OS_REGION_NAME")
     parser.add_argument("--os-username",
                         required=False,
                         default=os.environ.get("OS_USERNAME", None),
diff --git a/image-foundry.py b/image-foundry.py
index b4f38aa..8e333f7 100755
--- a/image-foundry.py
+++ b/image-foundry.py
@@ -42,7 +42,7 @@ def create_image(env, manifest):
 def main(args):
     env = Environment(args.os_auth_url,
                       args.os_project_name,
-                      args.os_region,
+                      args.os_region_name,
                       args.os_username,
                       args.os_password,
                       args.os_project_domain_name,
@@ -73,10 +73,10 @@ if __name__ == "__main__":
                         required=False,
                         default=os.environ.get("OS_PROJECT_NAME", None),
                         help="OpenStack openrc environment variable: OS_PROJECT_NAME")
-    parser.add_argument("--os-region",
+    parser.add_argument("--os-region-name",
                         required=False,
-                        default=os.environ.get("OS_REGION", None),
-                        help="OpenStack openrc environment variable: OS_REGION")
+                        default=os.environ.get("OS_REGION_NAME", None),
+                        help="OpenStack openrc environment variable: OS_REGION_NAME")
     parser.add_argument("--os-username",
                         required=False,
                         default=os.environ.get("OS_USERNAME", None),
diff --git a/libs/environment.py b/libs/environment.py
index 137c51a..138f185 100644
--- a/libs/environment.py
+++ b/libs/environment.py
@@ -6,7 +6,7 @@ class Environment(object):
     def __init__(self,
                  os_auth_url,
                  os_project_name,
-                 os_region,
+                 os_region_name,
                  os_username,
                  os_password,
                  os_project_domain_name,
@@ -16,7 +16,7 @@ class Environment(object):
                  extra_envs={}):
         if os_auth_url is None or \
             os_project_name is None or \
-            os_region is None or \
+            os_region_name is None or \
             os_username is None or \
             os_password is None or \
             os_project_domain_name is None or \
@@ -26,7 +26,7 @@ class Environment(object):
             print("All required environment arguments must have a value. You passed in:" + \
                   "\nos_auth_url = " + str(os_auth_url) + \
                   "\nos_project_name = " + str(os_project_name) + \
-                  "\nos_region = " + str(os_region) + \
+                  "\nos_region_name = " + str(os_region_name) + \
                   "\nos_username = " + str(os_username) + \
                   "\nos_password = " + str(os_password) + \
                   "\nos_project_domain_name = " + str(os_project_domain_name) + \
@@ -37,7 +37,7 @@ class Environment(object):
         else:
             self.os_auth_url = os_auth_url
             self.os_project_name = os_project_name
-            self.os_region = os_region
+            self.os_region_name = os_region_name
             self.os_username = os_username
             self.os_password = os_password
             self.os_project_domain_name = os_project_domain_name
diff --git a/libs/keystone.py b/libs/keystone.py
index 4899a68..2f01dae 100644
--- a/libs/keystone.py
+++ b/libs/keystone.py
@@ -24,7 +24,7 @@ class Keystone(object):
                            auth_url=self.os_auth_url)
         self.session = session.Session(auth=auth)
         self.client = keystoneclient.Client(session=self.session,
-                                            region_name=env.os_region)
+                                            region_name=env.os_region_name)
 
     def get_projects(self):
         return map(lambda x: Project(x.name, x.id),
-- 
cgit v1.3