diff options
| author | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2017-12-14 16:00:35 -0700 |
|---|---|---|
| committer | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2017-12-14 16:00:35 -0700 |
| commit | c785da53b43e033031902258ca0f24c48f4d594d (patch) | |
| tree | 510b3af798258dfaff4293507f9177e5e7e63763 /libs | |
| parent | 648723f14c18e51cefcad36a079f520168e241ea (diff) | |
OS_REGION -> OS_REGION_NAME
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/environment.py | 8 | ||||
| -rw-r--r-- | libs/keystone.py | 2 |
2 files changed, 5 insertions, 5 deletions
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), |