From: Zhijiang Hu <hu.zhijiang@zte.com.cn>
Date: Sat, 18 Nov 2017 09:57:29 +0000 (-0500)
Subject: password auth module seems can not accept region_name as argument
X-Git-Tag: opnfv-6.0.0~36
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F47%2F47447%2F2;p=daisy.git

password auth module seems can not accept region_name as argument

Please see the error info at the end of [1].

[1] https://build.opnfv.org/ci/job/daisy-deploy-daily-master/815/console

Change-Id: I309fd858ea10a8821c95d66a27b7840a7f70151c
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
---

diff --git a/deploy/post/keystoneauth.py b/deploy/post/keystoneauth.py
index fb321d3f..2d7d0e75 100644
--- a/deploy/post/keystoneauth.py
+++ b/deploy/post/keystoneauth.py
@@ -52,8 +52,7 @@ class Keystoneauth(object):
             'OS_USER_DOMAIN_NAME': 'user_domain_name',
             'OS_PROJECT_DOMAIN_NAME': 'project_domain_name',
             'OS_PROJECT_NAME': 'project_name',
-            'OS_ENDPOINT_TYPE': 'endpoint_type',
-            'OS_REGION_NAME': 'region_name'
+            'OS_ENDPOINT_TYPE': 'endpoint_type'
         }
 
         def parse_credential(creds, kv):
diff --git a/tests/unit/post/test_keystoneauth.py b/tests/unit/post/test_keystoneauth.py
index 1a3021ee..7bedf9f1 100644
--- a/tests/unit/post/test_keystoneauth.py
+++ b/tests/unit/post/test_keystoneauth.py
@@ -32,7 +32,7 @@ def test_create_Keystoneauth_instance(openrc, expected):
             'OS_PROJECT_DOMAIN_NAME': 'Default',
             'OS_PROJECT_NAME': 'admin',
             'OS_INTERFACE': 'internal',
-            'OS_IDENTITY_API_VERSION': 'region_name'
+            'OS_IDENTITY_API_VERSION': '3'
         },
         {
             'username': 'admin',
@@ -52,8 +52,7 @@ def test_create_Keystoneauth_instance(openrc, expected):
             'OS_USER_DOMAIN_NAME': 'Default',
             'OS_PROJECT_DOMAIN_NAME': 'Default',
             'OS_PROJECT_NAME': 'admin',
-            'OS_ENDPOINT_TYPE': 'Default',
-            'OS_REGION_NAME': 'Default'
+            'OS_ENDPOINT_TYPE': 'Default'
         },
         {
             'username': 'admin',
@@ -63,8 +62,7 @@ def test_create_Keystoneauth_instance(openrc, expected):
             'user_domain_name': 'Default',
             'project_domain_name': 'Default',
             'project_name': 'admin',
-            'endpoint_type': 'Default',
-            'region_name': 'Default'
+            'endpoint_type': 'Default'
         }
     )])
 def test__parse_credentials_in_Keystoneauth(raws, expected):