summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVu Cong Tuan <tuanvc@vn.fujitsu.com>2018-05-11 10:00:22 +0700
committerVu Cong Tuan <tuanvc@vn.fujitsu.com>2018-05-11 10:00:39 +0700
commit19e56c00640fed7e03c0f7aedb29357d3afec7b0 (patch)
tree46e8a164d57e6f05075161cff563e9c2ae3cec0a
parent7799c82537c3b5b52a299be04a68fd5fa301837c (diff)
Update "auth_url"
Following the change in Keystone Install Guide [1], this patch replace port 35357 with 5000 for "auth_url". For more details, please check similar changes which have been done on other projects: Nova [2], Neutron [3], Cinder [4], Glance [5]. In addition, update deprecated "auth_uri" to "www_authenticate_uri", according to [6]. [1] https://review.openstack.org/#/c/541857 [2] https://review.openstack.org/#/c/562812 [3] https://review.openstack.org/#/c/566491 [4] https://review.openstack.org/#/c/565464 [5] https://review.openstack.org/#/c/558932 [6] https://review.openstack.org/#/c/508522 Change-Id: I57ee0008e5b6eef2c289cfa029f51c920124d489
Notes
Notes (review): Code-Review+1: Van Hung Pham <hungpv@vn.fujitsu.com> Code-Review+1: Tuan Luong-Anh <tuanla@vn.fujitsu.com> Code-Review+1: chenxiangui <chenxiangui@inspur.com> Code-Review+1: Kim Bao Long <longkb@vn.fujitsu.com> Code-Review+2: Fabio Verboso <fverboso@unime.it> Workflow+1: Fabio Verboso <fverboso@unime.it> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Thu, 28 Jun 2018 14:25:52 +0000 Reviewed-on: https://review.openstack.org/567730 Project: openstack/iotronic Branch: refs/heads/master
-rw-r--r--etc/iotronic/iotronic.conf4
-rw-r--r--iotronic/common/keystone.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/etc/iotronic/iotronic.conf b/etc/iotronic/iotronic.conf
index 8501952..4020416 100644
--- a/etc/iotronic/iotronic.conf
+++ b/etc/iotronic/iotronic.conf
@@ -28,8 +28,8 @@ wamp_realm = s4t
28connection = mysql+pymsql://<user>:<password>@<host>/iotronic 28connection = mysql+pymsql://<user>:<password>@<host>/iotronic
29 29
30[keystone_authtoken] 30[keystone_authtoken]
31auth_uri = http://<keystone_host>:5000 31www_authenticate_uri = http://<keystone_host>:5000
32auth_url = http://<keystone_host>:35357 32auth_url = http://<keystone_host>:5000
33auth_plugin = password 33auth_plugin = password
34project_domain_id = default 34project_domain_id = default
35user_domain_id = default 35user_domain_id = default
diff --git a/iotronic/common/keystone.py b/iotronic/common/keystone.py
index c025ca6..3360478 100644
--- a/iotronic/common/keystone.py
+++ b/iotronic/common/keystone.py
@@ -46,7 +46,7 @@ def _is_apiv3(auth_url, auth_version):
46 46
47 47
48def _get_ksclient(token=None): 48def _get_ksclient(token=None):
49 auth_url = CONF.keystone_authtoken.auth_uri 49 auth_url = CONF.keystone_authtoken.www_authenticate_uri
50 if not auth_url: 50 if not auth_url:
51 raise exception.KeystoneFailure(_('Keystone API endpoint is missing')) 51 raise exception.KeystoneFailure(_('Keystone API endpoint is missing'))
52 52