baha/skyline-apiserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Add swift endpoint url when generate nginx.conf

Browse Source 
Add swift endpoint url when generate nginx.conf.
Add swift type into service mapping. Also update
the sample file of skyline.yaml.

Change-Id: Ib7dc4202bb390557afb665da7f5ae4004d40f324
This commit is contained in:
zhu.boxiang 2021-11-25 11:26:47 +08:00
parent 872f2f4847
commit c5ec9e0faf
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etc/skyline.yaml.sample
View File

@ -72,6 +72,7 @@ openstack:
image: glance image: glance
load-balancer: octavia load-balancer: octavia
network: neutron network: neutron
object-store: swift
orchestration: heat orchestration: heat
placement: placement placement: placement
volumev3: cinder volumev3: cinder

1
libs/skyline-apiserver/skyline_apiserver/config/openstack.py
View File

@ -174,6 +174,7 @@ service_mapping = Opt(
"placement": "placement", "placement": "placement",
"baremetal": "ironic", "baremetal": "ironic",
"load-balancer": "octavia", "load-balancer": "octavia",
"object-store": "swift",
}, },
) )

7
libs/skyline-nginx/skyline_nginx/cmd/generate_nginx.py
View File

@ -91,7 +91,12 @@ def get_proxy_endpoints() -> Dict[str, ProxyEndpoint]:
if raw_url.path: if raw_url.path:
raw_path = PurePath(raw_url.path) raw_path = PurePath(raw_url.path)
if len(raw_path.parts) > 1: if len(raw_path.parts) > 1:
if raw_path.match("%(tenant_id)s") or raw_path.match("$(project_id)s"): if (
raw_path.match("%(tenant_id)s")
or raw_path.match("AUTH_%(tenant_id)s")
or raw_path.match("$(project_id)s")
or raw_path.match("AUTH_$(project_id)s")
):
path = "" if str(raw_path.parents[1]) == "/" else raw_path.parents[1] path = "" if str(raw_path.parents[1]) == "/" else raw_path.parents[1]
elif raw_path.match("v[0-9]") or raw_path.match("v[0-9][.][0-9]"): elif raw_path.match("v[0-9]") or raw_path.match("v[0-9][.][0-9]"):
path = "" if str(raw_path.parents[0]) == "/" else raw_path.parents[0] path = "" if str(raw_path.parents[0]) == "/" else raw_path.parents[0]