airship
/
treasuremap
Code Issues Proposed changes

Fix airskiff endpoint catalog

Browse Source 
This cleans up the Airskiff endpoints by basing them off of the
sloop version.

Change-Id: I9207315a03469e59b205d74097ac83e56d1a9772
changes/15/656215/3
Matt McEuen 4 years ago
parent 74e6baf65e
commit 376e3882f9
2 changed files with 49 additions and 281 deletions
Show Stats Download Patch File Download Diff File

328
site/airskiff/software/config/endpoints.yaml
Unescape Escape View File

@ -10,72 +10,21 @@ metadata:
abstract: false
layer: site
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/CommonAddresses/v1
name: common-addresses
path: .dns.ingress_domain
dest:
- path: .ucp.identity.host_fqdn_override.public.host
pattern: DOMAIN
- path: .ucp.identity.host_fqdn_override.admin.host
pattern: DOMAIN
- path: .ceph.object_store.host_fqdn_override.public.host
pattern: DOMAIN
- path: .ceph.ceph_object_store.host_fqdn_override.public.host
pattern: DOMAIN
- src:
schema: deckhand/Certificate/v1
name: ingress-crt
path: .
dest:
- path: .ucp.identity.host_fqdn_override.public.tls.crt
- path: .ucp.shipyard.host_fqdn_override.public.tls.crt
- path: .ucp.physicalprovisioner.host_fqdn_override.public.tls.crt
- path: .ceph.object_store.host_fqdn_override.public.tls.crt
- path: .ceph.ceph_object_store.host_fqdn_override.public.tls.crt
- src:
schema: deckhand/CertificateAuthority/v1
name: ingress-ca
path: .
dest:
- path: .ucp.identity.host_fqdn_override.public.tls.ca
- path: .ucp.shipyard.host_fqdn_override.public.tls.ca
- path: .ucp.physicalprovisioner.host_fqdn_override.public.tls.ca
- path: .ceph.object_store.host_fqdn_override.public.tls.ca
- path: .ceph.ceph_object_store.host_fqdn_override.public.tls.ca
- src:
schema: deckhand/CertificateKey/v1
name: ingress-key
path: .
dest:
- path: .ucp.identity.host_fqdn_override.public.tls.key
- path: .ucp.shipyard.host_fqdn_override.public.tls.key
- path: .ucp.physicalprovisioner.host_fqdn_override.public.tls.key
- path: .ceph.object_store.host_fqdn_override.public.tls.key
- path: .ceph.ceph_object_store.host_fqdn_override.public.tls.key
data:
ucp:
identity:
namespace: ucp
name: keystone
hosts:
default: keystone
internal: keystone-api
host_fqdn_override:
default: null
public:
host: keystone-api.DOMAIN
admin:
host: keystone-api.DOMAIN
path:
default: /v3
scheme:
default: http
internal: http
default: "http"
internal: "http"
port:
api:
default: 5000
default: 80
internal: 5000
armada:
name: armada
@ -191,25 +140,24 @@ data:
name: drydock
hosts:
default: drydock-api
public: drydock-api
port:
api:
default: 9000
nodeport: 31900
public: 443
public: 80
path:
default: /api/v1.0
scheme:
default: "http"
public: "https"
public: "http"
host_fqdn_override:
default: null
public:
host: drydock-sw.DOMAIN
maas_region:
name: maas-region
hosts:
default: maas-region
public: maas
public: maas-region
path:
default: /MAAS
scheme:
@ -224,8 +172,6 @@ data:
default: 8000
host_fqdn_override:
default: null
public:
host: maas-sw.DOMAIN
maas_ingress:
hosts:
default: maas-ingress
@ -267,10 +213,12 @@ data:
port:
api:
default: 9000
public: 80
path:
default: /api/v1.0
scheme:
default: "http"
public: "http"
host_fqdn_override:
default: null
prometheus_openstack_exporter:
@ -295,17 +243,15 @@ data:
public: radosgw
host_fqdn_override:
default: null
public:
host: object-store-sw.DOMAIN
path:
default: /swift/v1
scheme:
default: "http"
public: "https"
public: "http"
port:
api:
default: 8088
public: 443
public: 80
ceph_object_store:
name: radosgw
namespace: ceph
@ -314,17 +260,15 @@ data:
public: radosgw
host_fqdn_override:
default: null
public:
host: object-store-sw.DOMAIN
path:
default: /auth/v1.0
scheme:
default: "http"
public: "https"
public: "http"
port:
api:
default: 8088
public: 443
public: 80
ceph_mon:
namespace: ceph
hosts:
@ -379,99 +323,6 @@ metadata:
abstract: false
layer: site
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/CommonAddresses/v1
name: common-addresses
path: .dns.ingress_domain
dest:
- path: .osh.object_store.host_fqdn_override.public.host
pattern: DOMAIN
- path: .osh.ceph_object_store.host_fqdn_override.public.host
pattern: DOMAIN
- path: .osh.image.host_fqdn_override.public.host
pattern: DOMAIN
- path: .osh.cloudformation.host_fqdn_override.public.host
pattern: DOMAIN
- path: .osh.orchestration.host_fqdn_override.public.host
pattern: DOMAIN
- path: .osh.compute.host_fqdn_override.public.host
pattern: DOMAIN
- path: .osh.compute_novnc_proxy.host_fqdn_override.public.host
pattern: DOMAIN
- path: .osh.placement.host_fqdn_override.public.host
pattern: DOMAIN
- path: .osh.network.host_fqdn_override.public.host
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
pattern: DOMAIN
- path: .osh.volumev2.host_fqdn_override.public.host
pattern: DOMAIN
- path: .osh.volumev3.host_fqdn_override.public.host
pattern: DOMAIN
- src:
schema: deckhand/Certificate/v1
name: ingress-crt
path: .
dest:
- path: .osh.object_store.host_fqdn_override.public.tls.crt
- path: .osh.ceph_object_store.host_fqdn_override.public.tls.crt
- path: .osh.identity.host_fqdn_override.public.tls.crt
- path: .osh.orchestration.host_fqdn_override.public.tls.crt
- path: .osh.cloudformation.host_fqdn_override.public.tls.crt
- path: .osh.dashboard.host_fqdn_override.public.tls.crt
- path: .osh.image.host_fqdn_override.public.tls.crt
- path: .osh.volume.host_fqdn_override.public.tls.crt
- path: .osh.volumev2.host_fqdn_override.public.tls.crt
- path: .osh.volumev3.host_fqdn_override.public.tls.crt
- path: .osh.compute.host_fqdn_override.public.tls.crt
- path: .osh.compute_novnc_proxy.host_fqdn_override.public.tls.crt
- path: .osh.placement.host_fqdn_override.public.tls.crt
- path: .osh.network.host_fqdn_override.public.tls.crt
- src:
schema: deckhand/CertificateAuthority/v1
name: ingress-ca
path: .
dest:
- path: .osh.object_store.host_fqdn_override.public.tls.ca
- path: .osh.ceph_object_store.host_fqdn_override.public.tls.ca
- path: .osh.identity.host_fqdn_override.public.tls.ca
- path: .osh.orchestration.host_fqdn_override.public.tls.ca
- path: .osh.cloudformation.host_fqdn_override.public.tls.ca
- path: .osh.dashboard.host_fqdn_override.public.tls.ca
- path: .osh.image.host_fqdn_override.public.tls.ca
- path: .osh.volume.host_fqdn_override.public.tls.ca
- path: .osh.volumev2.host_fqdn_override.public.tls.ca
- path: .osh.volumev3.host_fqdn_override.public.tls.ca
- path: .osh.compute.host_fqdn_override.public.tls.ca
- path: .osh.compute_novnc_proxy.host_fqdn_override.public.tls.ca
- path: .osh.placement.host_fqdn_override.public.tls.ca
- path: .osh.network.host_fqdn_override.public.tls.ca
- src:
schema: deckhand/CertificateKey/v1
name: ingress-key
path: .
dest:
- path: .osh.object_store.host_fqdn_override.public.tls.key
- path: .osh.ceph_object_store.host_fqdn_override.public.tls.key
- path: .osh.identity.host_fqdn_override.public.tls.key
- path: .osh.orchestration.host_fqdn_override.public.tls.key
- path: .osh.cloudformation.host_fqdn_override.public.tls.key
- path: .osh.dashboard.host_fqdn_override.public.tls.key
- path: .osh.image.host_fqdn_override.public.tls.key
- path: .osh.volume.host_fqdn_override.public.tls.key
- path: .osh.volumev2.host_fqdn_override.public.tls.key
- path: .osh.volumev3.host_fqdn_override.public.tls.key
- path: .osh.compute.host_fqdn_override.public.tls.key
- path: .osh.compute_novnc_proxy.host_fqdn_override.public.tls.key
- path: .osh.placement.host_fqdn_override.public.tls.key
- path: .osh.network.host_fqdn_override.public.tls.key
data:
osh:
object_store:
@ -482,17 +333,15 @@ data:
public: radosgw
host_fqdn_override:
default: null
public:
host: object-store-sw.DOMAIN
path:
default: /swift/v1/KEY_$(tenant_id)s
scheme:
default: "http"
public: "https"
public: "http"
port:
api:
default: 8088
public: 443
public: 80
ceph_object_store:
name: radosgw
namespace: openstack
@ -501,17 +350,15 @@ data:
public: radosgw
host_fqdn_override:
default: null
public:
host: object-store-sw.DOMAIN
path:
default: /auth/v1.0
scheme:
default: "http"
public: "https"
public: "http"
port:
api:
default: 8088
public: 443
public: 80
oslo_db:
hosts:
default: mariadb
@ -576,23 +423,16 @@ data:
identity:
namespace: openstack
name: keystone
hosts:
default: keystone
internal: keystone-api
host_fqdn_override:
default: null
public:
host: identity.DOMAIN
admin:
host: identity.DOMAIN
path:
default: /v3
scheme:
default: "https"
default: "http"
internal: "http"
port:
api:
default: 443
default: 80
internal: 5000
glance_oslo_messaging:
namespace: openstack
@ -627,17 +467,15 @@ data:
public: glance
host_fqdn_override:
default: null
public:
host: image.DOMAIN
path:
default: null
scheme:
default: "http"
public: "https"
public: "http"
port:
api:
default: 9292
public: 443
public: 80
image_registry:
name: glance-registry
hosts:
@ -686,17 +524,15 @@ data:
public: cinder
host_fqdn_override:
default: null
public:
host: volume-sw.DOMAIN
path:
default: "/v1/%(tenant_id)s"
scheme:
default: "http"
public: "https"
public: "http"
port:
api:
default: 8776
public: 443
public: 80
volumev2:
name: cinderv2
hosts:
@ -704,17 +540,15 @@ data:
public: cinder
host_fqdn_override:
default: null
public:
host: volume-sw.DOMAIN
path:
default: "/v2/%(tenant_id)s"
scheme:
default: "http"
public: "https"
public: "http"
port:
api:
default: 8776
public: 443
public: 80
volumev3:
name: cinderv3
hosts:
@ -722,17 +556,15 @@ data:
public: cinder
host_fqdn_override:
default: null
public:
host: volume-sw.DOMAIN
path:
default: "/v3/%(tenant_id)s"
scheme:
default: "http"
public: "https"
public: "http"
port:
api:
default: 8776
public: 443
public: 80
heat_oslo_messaging:
namespace: openstack
hosts:
@ -766,17 +598,15 @@ data:
public: heat
host_fqdn_override:
default: null
public:
host: orchestration.DOMAIN
path:
default: "/v1/%(project_id)s"
scheme:
default: "http"
public: "https"
public: "http"
port:
api:
default: 8004
public: 443
public: 80
cloudformation:
name: heat-cfn
hosts:
@ -784,17 +614,15 @@ data:
public: cloudformation
host_fqdn_override:
default: null
public:
host: cloudformation.DOMAIN
path:
default: /v1
scheme:
default: "http"
public: "https"
public: "http"
port:
api:
default: 8000
public: 443
public: 80
cloudwatch:
name: heat-cloudwatch
hosts:
@ -844,17 +672,15 @@ data:
public: neutron
host_fqdn_override:
default: null
public:
host: network.DOMAIN
path:
default: null
scheme:
default: "http"
public: "https"
public: "http"
port:
api:
default: 9696
public: 443
public: 80
nova_oslo_messaging:
namespace: openstack
hosts:
@ -888,19 +714,17 @@ data:
public: nova
host_fqdn_override:
default: null
public:
host: compute.DOMAIN
path:
default: "/v2/%(tenant_id)s"
scheme:
default: "http"
public: "https"
public: "http"
port:
api:
default: 8774
public: 443
public: 80
novncproxy:
default: 443
default: 80
compute_metadata:
name: nova
hosts:
@ -923,17 +747,15 @@ data:
public: novncproxy
host_fqdn_override:
default: null
public:
host: nova-novncproxy.DOMAIN
path:
default: /vnc_auto.html
scheme:
default: "http"
public: "https"
public: "http"
port:
novnc_proxy:
default: 6080
public: 443
public: 80
compute_spice_proxy:
name: nova
hosts:
@ -954,17 +776,15 @@ data:
public: placement
host_fqdn_override:
default: null
public:
host: placement.DOMAIN
path:
default: /
scheme:
default: "http"
public: "https"
public: "http"
port:
api:
default: 8778
public: 443
public: 80
dashboard:
name: horizon
hosts:
@ -972,17 +792,15 @@ data:
public: horizon
host_fqdn_override:
default: null
public:
host: dashboard-sw.DOMAIN
path:
default: null
scheme:
default: "http"
public: "https"
public: "http"
port:
web:
default: 80
public: 443
public: 80
...
---
schema: pegleg/EndpointCatalogue/v1
@ -994,48 +812,6 @@ metadata:
layer: site
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/CommonAddresses/v1
name: common-addresses
path: .dns.ingress_domain
dest:
- path: .osh_infra.kibana.host_fqdn_override.public.host
pattern: DOMAIN
- path: .osh_infra.grafana.host_fqdn_override.public.host
pattern: DOMAIN
- path: .osh_infra.nagios.host_fqdn_override.public.host
pattern: DOMAIN
- src:
schema: deckhand/Certificate/v1
name: ingress-crt
path: .
dest:
- path: .osh_infra.kibana.host_fqdn_override.public.tls.crt
- path: .osh_infra.grafana.host_fqdn_override.public.tls.crt
- path: .osh_infra.nagios.host_fqdn_override.public.tls.crt
- src:
schema: deckhand/CertificateAuthority/v1
name: ingress-ca
path: .
dest:
- path: .osh_infra.kibana.host_fqdn_override.public.tls.ca
- path: .osh_infra.grafana.host_fqdn_override.public.tls.ca
- path: .osh_infra.nagios.host_fqdn_override.public.tls.ca
- src:
schema: deckhand/CertificateKey/v1
name: ingress-key
path: .
dest:
- path: .osh_infra.kibana.host_fqdn_override.public.tls.key
- path: .osh_infra.grafana.host_fqdn_override.public.tls.key
- path: .osh_infra.nagios.host_fqdn_override.public.tls.key
- src:
schema: pegleg/CommonAddresses/v1
name: common-addresses
path: .ldap.base_url
dest:
path: .osh_infra.ldap.host_fqdn_override.public.host
pattern: DOMAIN
- src:
schema: pegleg/CommonAddresses/v1
name: common-addresses
@ -1149,17 +925,15 @@ data:
public: grafana
host_fqdn_override:
default: null
public:
host: grafana-sw.DOMAIN
path:
default: null
scheme:
default: "http"
public: "https"
public: "http"
port:
grafana:
default: 3000
public: 443
public: 80
monitoring:
name: prometheus
namespace: osh-infra
@ -1185,17 +959,15 @@ data:
public: kibana
host_fqdn_override:
default: null
public:
host: kibana-sw.DOMAIN
path:
default: null
scheme:
default: "http"
public: "https"
public: "http"
port:
kibana:
default: 5601
public: 443
public: 80
alerts:
name: alertmanager
namespace: osh-infra
@ -1287,24 +1059,20 @@ data:
public: nagios
host_fqdn_override:
default: null
public:
host: nagios-sw.DOMAIN
path:
default: null
scheme:
default: "http"
public: "https"
public: "http"
port:
http:
default: 80
public: 443
public: 80
ldap:
hosts:
default: ldap
host_fqdn_override:
default: null
public:
host: DOMAIN
path:
default: /AUTH_PATH
scheme:

2
tools/deployment/airskiff/developer/020-setup-client.sh
Unescape Escape View File

@ -44,5 +44,5 @@ clouds:
project_name: 'admin'
project_domain_name: 'default'
user_domain_name: 'default'
auth_url: 'http://keystone.openstack.svc.cluster.local/v3'
auth_url: 'http://keystone-api.openstack.svc.cluster.local:5000/v3'
EOF

Write Preview
Loading…
Cancel
Save