feat: Add swift endpoint url when generate nginx.conf
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:
parent
872f2f4847
commit
c5ec9e0faf
@ -72,6 +72,7 @@ openstack:
|
||||
image: glance
|
||||
load-balancer: octavia
|
||||
network: neutron
|
||||
object-store: swift
|
||||
orchestration: heat
|
||||
placement: placement
|
||||
volumev3: cinder
|
||||
|
@ -174,6 +174,7 @@ service_mapping = Opt(
|
||||
"placement": "placement",
|
||||
"baremetal": "ironic",
|
||||
"load-balancer": "octavia",
|
||||
"object-store": "swift",
|
||||
},
|
||||
)
|
||||
|
||||
|
@ -91,7 +91,12 @@ def get_proxy_endpoints() -> Dict[str, ProxyEndpoint]:
|
||||
if raw_url.path:
|
||||
raw_path = PurePath(raw_url.path)
|
||||
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]
|
||||
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]
|
||||
|
Loading…
Reference in New Issue
Block a user