From c7c346de9a91c1020f16d8124688491603e55ef9 Mon Sep 17 00:00:00 2001 From: yangshaoxue Date: Wed, 14 Dec 2022 15:00:40 +0800 Subject: [PATCH] fix: Fix keystone_url default sample Fixed the issue that keystone_url's default sample was incorrect Change-Id: I0e5157c1f2cb3a89f3abcd6decc3371116a79835 --- doc/source/configuration/settings.rst | 2 +- etc/skyline.yaml.sample | 2 +- skyline_apiserver/config/openstack.py | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/doc/source/configuration/settings.rst b/doc/source/configuration/settings.rst index 5bdaf99..15f46d6 100644 --- a/doc/source/configuration/settings.rst +++ b/doc/source/configuration/settings.rst @@ -35,7 +35,7 @@ file ``skyline.yaml.sample`` in ``etc`` directory. qos: neutron_qos vpnaas: neutron_vpn interface_type: public - keystone_url: http://localhost:5000/v3/ + keystone_url: http://127.0.0.1:5000/v3/ nginx_prefix: /api/openstack reclaim_instance_interval: 604800 service_mapping: diff --git a/etc/skyline.yaml.sample b/etc/skyline.yaml.sample index c6f7961..ef41eab 100644 --- a/etc/skyline.yaml.sample +++ b/etc/skyline.yaml.sample @@ -24,7 +24,7 @@ openstack: qos: neutron_qos vpnaas: neutron_vpn interface_type: public - keystone_url: http://localhost:5000/v3/ + keystone_url: http://127.0.0.1:5000/v3/ nginx_prefix: /api/openstack reclaim_instance_interval: 604800 service_mapping: diff --git a/skyline_apiserver/config/openstack.py b/skyline_apiserver/config/openstack.py index 23cdaba..fbf3afd 100644 --- a/skyline_apiserver/config/openstack.py +++ b/skyline_apiserver/config/openstack.py @@ -23,9 +23,12 @@ from skyline_apiserver.types import InterfaceType keystone_url = Opt( name="keystone_url", - description="Keystone endpoint address", + description=( + "Keystone endpoint address. If using domain, " + "top level domain is required. For example: example.org" + ), schema=HttpUrl, - default="http://localhost:5000/v3/", + default="http://127.0.0.1:5000/v3/", ) system_project_domain = Opt(