airship/treasuremap
Code Issues Proposed changes

Set Keystone admin endpoint to match public

Browse Source 
Change-Id: I1f82cd65fb21cb6a8147ffdc68b0da9197f3fdf7
This commit is contained in:
Kaspars Skels 2018-09-24 19:45:07 -05:00
parent 6b183e148b
commit 21dd6408c6
2 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
global/schemas/pegleg/EndpointCatalogue/v1.yaml
View File

@ -77,6 +77,25 @@ data:
type: string
additionalProperties:
type: string
admin:
oneOf:
- type: string
- type: "null"
- type: object
properties:
host:
type: string
tls:
type: object
properties:
crt:
type: string
ca:
type: string
key:
type: string
additionalProperties:
type: string
internal:
oneOf:
- type: string

20
site/airship-seaworthy/software/config/endpoints.yaml
View File

@ -18,6 +18,8 @@ metadata:
dest:
- path: .ucp.identity.host_fqdn_override.public.host
pattern: DOMAIN
- path: .ucp.identity.host_fqdn_override.admin.host
pattern: DOMAIN
- path: .ucp.shipyard.host_fqdn_override.public.host
pattern: DOMAIN
- path: .ceph.object_store.host_fqdn_override.public.host
@ -109,18 +111,18 @@ data:
default: null
public:
host: iam.DOMAIN
admin:
host: iam.DOMAIN
path:
default: /v3
scheme:
default: http
# public: https
port:
admin:
default: 35357
api:
default: 5000
default: 80
# public: 443
public: 80
internal: 5000
armada:
name: armada
hosts:
@ -401,6 +403,8 @@ metadata:
pattern: DOMAIN
- path: .osh.identity.host_fqdn_override.public.host
pattern: DOMAIN
- path: .osh.identity.host_fqdn_override.admin.host
pattern: DOMAIN
- path: .osh.dashboard.host_fqdn_override.public.host
pattern: DOMAIN
- path: .osh.volume.host_fqdn_override.public.host
@ -762,18 +766,18 @@ data:
default: null
public:
host: identity.DOMAIN
admin:
host: identity.DOMAIN
path:
default: /v3
scheme:
default: "http"
# public: "https"
port:
admin:
default: 35357
api:
default: 5000
default: 80
# public: 443
public: 80
internal: 5000
glance_oslo_messaging:
namespace: openstack
hosts: