fix: get domain always from admin interface
Use config interface in keystone client, rather than default value. Closes-bug: #1940148 Change-Id: Id0cec1e488f854bfd6e2321e6abe9ac6d5f4a486
This commit is contained in:
parent
f5c946e1c6
commit
b8be76df8a
@ -140,14 +140,17 @@ Skyline 的吉祥物是九色鹿。九色鹿源自于敦煌壁画《九色鹿本
|
|||||||
- make >= 3.82
|
- make >= 3.82
|
||||||
- python >= 3.8
|
- python >= 3.8
|
||||||
- poetry >= 1.1.0 ([安装指南](https://python-poetry.org/docs/#installation))
|
- poetry >= 1.1.0 ([安装指南](https://python-poetry.org/docs/#installation))
|
||||||
- node >= 10.22.0
|
- node >= 10.22.0 (可选,只开发 API 就用不到)
|
||||||
- yarn >= 1.22.4
|
- yarn >= 1.22.4 (可选,只开发 API 就用不到)
|
||||||
|
|
||||||
### 安装和运行
|
### 安装和运行
|
||||||
|
|
||||||
1. 安装依赖包
|
1. 安装依赖包
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
|
# 如果只开发 apiserver,可以通过 export IGNORE_JS=True 来跳过安装 skyline-console
|
||||||
|
export IGNORE_JS=True
|
||||||
|
|
||||||
make install
|
make install
|
||||||
```
|
```
|
||||||
|
|
||||||
|
@ -140,14 +140,17 @@ You can now access the dashboard: `https://<ip_address>:8080`
|
|||||||
- make >= 3.82
|
- make >= 3.82
|
||||||
- python >= 3.8
|
- python >= 3.8
|
||||||
- poetry >= 1.1.0 ([Installation Guide](https://python-poetry.org/docs/#installation))
|
- poetry >= 1.1.0 ([Installation Guide](https://python-poetry.org/docs/#installation))
|
||||||
- node >= 10.22.0
|
- node >= 10.22.0 (Optional if you only develop with apiserver)
|
||||||
- yarn >= 1.22.4
|
- yarn >= 1.22.4 (Optional if you only develop with apiserver)
|
||||||
|
|
||||||
### Install & Run
|
### Install & Run
|
||||||
|
|
||||||
1. Installing dependency packages
|
1. Installing dependency packages
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
|
# You can export IGNORE_JS=True to skip skyline-console if only develop with apiserver
|
||||||
|
export IGNORE_JS=True
|
||||||
|
|
||||||
make install
|
make install
|
||||||
```
|
```
|
||||||
|
|
||||||
|
@ -2,9 +2,9 @@ default:
|
|||||||
access_token_expire: 3600
|
access_token_expire: 3600
|
||||||
access_token_renew: 1800
|
access_token_renew: 1800
|
||||||
cors_allow_origins: []
|
cors_allow_origins: []
|
||||||
database_url: mysql://root:root@localhost:3306/skyline
|
database_url: sqlite:////tmp/skyline.db
|
||||||
debug: false
|
debug: false
|
||||||
log_dir: ./log
|
log_dir: /tmp
|
||||||
secret_key: aCtmgbcUqYUy_HNVg5BDXCaeJgJQzHJXwqbXr0Nmb2o
|
secret_key: aCtmgbcUqYUy_HNVg5BDXCaeJgJQzHJXwqbXr0Nmb2o
|
||||||
session_name: session
|
session_name: session
|
||||||
developer:
|
developer:
|
||||||
@ -61,7 +61,7 @@ openstack:
|
|||||||
extension_mapping:
|
extension_mapping:
|
||||||
fwaas_v2: neutron_firewall
|
fwaas_v2: neutron_firewall
|
||||||
vpnaas: neutron_vpn
|
vpnaas: neutron_vpn
|
||||||
interface_type: internal
|
interface_type: public
|
||||||
keystone_url: http://localhost:5000/v3/
|
keystone_url: http://localhost:5000/v3/
|
||||||
nginx_prefix: /api/openstack
|
nginx_prefix: /api/openstack
|
||||||
reclaim_instance_interval: 604800
|
reclaim_instance_interval: 604800
|
||||||
|
@ -94,7 +94,7 @@ async def login(
|
|||||||
reauthenticate=False,
|
reauthenticate=False,
|
||||||
)
|
)
|
||||||
session = Session(auth=unscope_auth, verify=False, timeout=constants.DEFAULT_TIMEOUT)
|
session = Session(auth=unscope_auth, verify=False, timeout=constants.DEFAULT_TIMEOUT)
|
||||||
unscope_client = KeystoneClient(session=session, endpoint=auth_url)
|
unscope_client = KeystoneClient(session=session, endpoint=auth_url, interface=CONF.openstack.interface_type)
|
||||||
project_scope = unscope_client.auth.projects()
|
project_scope = unscope_client.auth.projects()
|
||||||
# we must get the project_scope with enabled project
|
# we must get the project_scope with enabled project
|
||||||
project_scope = [scope for scope in project_scope if scope.enabled]
|
project_scope = [scope for scope in project_scope if scope.enabled]
|
||||||
|
@ -102,6 +102,7 @@ async def keystone_client(
|
|||||||
session=session,
|
session=session,
|
||||||
endpoint=endpoint,
|
endpoint=endpoint,
|
||||||
global_request_id=global_request_id,
|
global_request_id=global_request_id,
|
||||||
|
interface=CONF.openstack.interface_type,
|
||||||
)
|
)
|
||||||
return client
|
return client
|
||||||
|
|
||||||
|
@ -13,6 +13,7 @@ venv:
|
|||||||
.PHONY: install
|
.PHONY: install
|
||||||
install: venv
|
install: venv
|
||||||
poetry run pip install -U pip setuptools
|
poetry run pip install -U pip setuptools
|
||||||
|
poetry run pip install tempita==0.5.2
|
||||||
poetry install -vvv
|
poetry install -vvv
|
||||||
tools/post_install.sh
|
tools/post_install.sh
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user