airship/treasuremap
Code Issues Proposed changes

Integrate support for MAAS HA and VIPs

Browse Source 
Change-Id: I1c7f3892a03536d94064da1722751eb6683da451
Signed-off-by: Dimitrios Markou <dimitrios.markou@att.com>
This commit is contained in:
Dimitrios Markou 2019-04-05 15:02:32 -05:00 committed by Kaspars Skels
parent 2ed2a37124
commit 46100f03c7
14 changed files with 287 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
global/software/charts/kubernetes/ingress/ingress.yaml
View File

@ -52,7 +52,7 @@ data:
node_selector_value: enabled
deployment:
mode: cluster
type: DaemonSet
type: Deployment
network:
host_namespace: true
ingress:
@ -60,7 +60,8 @@ data:
nginx.ingress.kubernetes.io/proxy-read-timeout: "603"
pod:
replicas:
error_page: 2
ingress: 1
error_page: 1
dependencies:
- ingress-kube-system-htk
---

26
global/software/charts/ucp/drydock/drydock.yaml
View File

@ -47,6 +47,12 @@ metadata:
path: .ucp.physicalprovisioner
dest:
path: .values.endpoints.physicalprovisioner
- src:
schema: pegleg/EndpointCatalogue/v1
name: ucp_endpoints
path: .ucp.maas_region
dest:
path: .values.endpoints.maas_region
# Drydock IPs
- src:
@ -62,22 +68,6 @@ metadata:
dest:
path: .values.endpoints.physicalprovisioner.port.api.nodeport
# MaaS IPs
- src:
schema: pegleg/CommonAddresses/v1
name: common-addresses
path: .genesis.ip
dest:
path: .values.conf.drydock.maasdriver.maas_api_url
pattern: 'MAAS_IP'
- src:
schema: pegleg/CommonAddresses/v1
name: common-addresses
path: .node_ports.maas_api
dest:
path: .values.conf.drydock.maasdriver.maas_api_url
pattern: 'MAAS_PORT'
# Credentials
- src:
@ -162,13 +152,11 @@ data:
network:
api:
nodeport:
enabled: true
enabled: false
conf:
drydock:
database:
pool_size: 200
maasdriver:
maas_api_url: http://MAAS_IP:MAAS_PORT/MAAS/api/2.0/
plugins:
ingester: drydock_provisioner.ingester.plugins.deckhand.DeckhandIngester
dependencies:

73
global/software/charts/ucp/drydock/maas.yaml
View File

@ -26,50 +26,6 @@ metadata:
dest:
path: .values.images.tags
# Drydock IPs
- src:
schema: pegleg/CommonAddresses/v1
name: common-addresses
path: .bootstrap.ip
dest:
path: .values.conf.drydock.bootaction_url
pattern: '(DRYDOCK_IP)'
- src:
schema: pegleg/CommonAddresses/v1
name: common-addresses
path: .node_ports.drydock_api
dest:
path: .values.conf.drydock.bootaction_url
pattern: '(DRYDOCK_PORT)'
# MaaS IPs
- src:
schema: pegleg/CommonAddresses/v1
name: common-addresses
path: .bootstrap.ip
dest:
path: .values.conf.maas.url.maas_url
pattern: '(MAAS_IP)'
- src:
schema: pegleg/CommonAddresses/v1
name: common-addresses
path: .node_ports.maas_api
dest:
path: .values.conf.maas.url.maas_url
pattern: '(MAAS_PORT)'
- src:
schema: pegleg/CommonAddresses/v1
name: common-addresses
path: .node_ports.maas_api
dest:
path: .values.network.gui.node_port.port
- src:
schema: pegleg/CommonAddresses/v1
name: common-addresses
path: .node_ports.maas_proxy
dest:
path: .values.network.port.service_proxy
# MaaS Config
- src:
schema: pegleg/CommonAddresses/v1
@ -100,10 +56,21 @@ metadata:
- src:
schema: pegleg/EndpointCatalogue/v1
name: ucp_endpoints
path: .ucp.maas_region_ui
path: .ucp.maas_region
dest:
path: .values.endpoints.maas_region_ui
path: .values.endpoints.maas_region
- src:
schema: pegleg/EndpointCatalogue/v1
name: ucp_endpoints
path: .ucp.maas_ingress
dest:
path: .values.endpoints.maas_ingress
- src:
schema: pegleg/EndpointCatalogue/v1
name: ucp_endpoints
path: .ucp.physicalprovisioner
dest:
path: .values.endpoints.physicalprovisioner
# Account and credential substitutions
- src:
schema: pegleg/AccountCatalogue/v1
@ -129,11 +96,11 @@ metadata:
name: ucp_service_accounts
path: .ucp.maas.admin
dest:
path: .values.endpoints.maas_region_ui.auth.admin
path: .values.endpoints.maas_region.auth.admin
# Secrets
- dest:
path: .values.endpoints.maas_region_ui.auth.admin.password
path: .values.endpoints.maas_region.auth.admin.password
src:
schema: deckhand/Passphrase/v1
name: ucp_maas_admin_password
@ -168,6 +135,10 @@ data:
labels:
release_group: airship-maas
values:
pod:
replicas:
region: 1
rack: 1
labels:
rack:
node_selector_key: maas-control-plane
@ -186,14 +157,10 @@ data:
conf:
cache:
enabled: true
drydock:
bootaction_url: http://DRYDOCK_IP:DRYDOCK_PORT/api/v1.0/bootactions/nodes/
maas:
credentials:
secret:
namespace: ucp
url:
maas_url: http://MAAS_IP:MAAS_PORT/MAAS
proxy:
# Use MAAS Built-in proxy. This supports environments where
# the PXE interface can not reach the internet.

20
global/software/config/versions.yaml
View File

@ -323,7 +323,7 @@ data:
type: git
drydock:
location: https://git.openstack.org/openstack/airship-drydock
reference: 3470f89519d018c572905566891bafc8a3c51c3b
reference: 8f7c91fb9dc97824d426d7384ad1b8dbbf0552c9
subpath: charts/drydock
type: git
drydock-htk:
@ -353,7 +353,7 @@ data:
type: git
maas:
location: https://git.openstack.org/openstack/airship-maas
reference: 2e003450cceb16b9bda71aa69a939a8466516582
reference: 5e4ab93da83733a3ccc3f2f50d812242f11fe82e
subpath: charts/maas
type: git
maas-htk:
@ -543,17 +543,17 @@ data:
divingbell:
divingbell: docker.io/ubuntu:16.04
drydock:
drydock: quay.io/airshipit/drydock:3470f89519d018c572905566891bafc8a3c51c3b
drydock_db_sync: quay.io/airshipit/drydock:3470f89519d018c572905566891bafc8a3c51c3b
drydock: quay.io/airshipit/drydock:8f7c91fb9dc97824d426d7384ad1b8dbbf0552c9
drydock_db_sync: quay.io/airshipit/drydock:8f7c91fb9dc97824d426d7384ad1b8dbbf0552c9
ingress: {}
keystone: {}
maas:
bootstrap: quay.io/airshipit/maas-region-controller:2e003450cceb16b9bda71aa69a939a8466516582
db_sync: quay.io/airshipit/maas-region-controller:2e003450cceb16b9bda71aa69a939a8466516582
export_api_key: quay.io/airshipit/maas-region-controller:2e003450cceb16b9bda71aa69a939a8466516582
maas_cache: quay.io/airshipit/sstream-cache:361b13342ef60b6aa0e3ad523fb2084c95881a31
maas_rack: quay.io/airshipit/maas-rack-controller:2e003450cceb16b9bda71aa69a939a8466516582
maas_region: quay.io/airshipit/maas-region-controller:2e003450cceb16b9bda71aa69a939a8466516582
db_sync: quay.io/airshipit/maas-region-controller:5e4ab93da83733a3ccc3f2f50d812242f11fe82e
maas_rack: quay.io/airshipit/maas-rack-controller:5e4ab93da83733a3ccc3f2f50d812242f11fe82e
maas_region: quay.io/airshipit/maas-region-controller:5e4ab93da83733a3ccc3f2f50d812242f11fe82e
bootstrap: quay.io/airshipit/maas-region-controller:5e4ab93da83733a3ccc3f2f50d812242f11fe82e
export_api_key: quay.io/airshipit/maas-region-controller:5e4ab93da83733a3ccc3f2f50d812242f11fe82e
maas_cache: quay.io/airshipit/sstream-cache:5e4ab93da83733a3ccc3f2f50d812242f11fe82e
mariadb: {}
memcached: {}
postgresql: {}

2
site/airship-seaworthy/networks/common-addresses.yaml
View File

@ -22,6 +22,8 @@ data:
# network. E.g. VLAN 22 for the calico network as a member of bond0, you
# would set "interface=bond0.22" as shown here.
ip_autodetection_method: interface=bond0.22
ip_rule:
gateway: '10.23.21.1'
etcd:
# etcd service IP address
service_ip: 10.96.232.136

9
site/airship-seaworthy/software/charts/kubernetes/ingress/ingress.yaml
View File

@ -14,5 +14,12 @@ metadata:
- method: merge
path: .
storagePolicy: cleartext
data: {}
data:
values:
network:
ingress:
disable-ipv6: "true"
vip:
manage: true
addr: '10.23.21.20/32'
...

25
site/airship-seaworthy/software/charts/ucp/drydock/drydock.yaml Normal file
View File

@ -0,0 +1,25 @@
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: ucp-drydock
layeringDefinition:
abstract: false
layer: site
parentSelector:
name: ucp-drydock-global
actions:
- method: merge
path: .
labels:
name: ucp-drydock-site
storagePolicy: cleartext
replacement: true
data:
values:
network:
api:
ingress:
classes:
cluster: "maas-ingress"
...

3
site/airship-seaworthy/software/charts/ucp/drydock/maas.yaml
View File

@ -21,4 +21,7 @@ data:
default_os: 'ubuntu'
default_image: 'xenial'
default_kernel: 'hwe-16.04'
network:
maas_ingress:
addr: '10.23.20.9/32'
...

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

@ -22,6 +22,10 @@ metadata:
pattern: DOMAIN
- path: .ucp.shipyard.host_fqdn_override.public.host
pattern: DOMAIN
- path: .ucp.physicalprovisioner.host_fqdn_override.public.host
pattern: DOMAIN
- path: .ucp.maas_region.host_fqdn_override.public.host
pattern: DOMAIN
- path: .ceph.object_store.host_fqdn_override.public.host
pattern: DOMAIN
- path: .ceph.ceph_object_store.host_fqdn_override.public.host
@ -33,6 +37,7 @@ metadata:
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:
@ -42,6 +47,7 @@ metadata:
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:
@ -51,6 +57,7 @@ metadata:
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:
@ -64,9 +71,9 @@ data:
host_fqdn_override:
default: null
public:
host: iam.DOMAIN
host: iam-sw.DOMAIN
admin:
host: iam.DOMAIN
host: iam-sw.DOMAIN
path:
default: /v3
scheme:
@ -194,27 +201,57 @@ data:
api:
default: 9000
nodeport: 31900
public: 443
path:
default: /api/v1.0
scheme:
default: "http"
public: "https"
host_fqdn_override:
default: null
maas_region_ui:
name: maas-region-ui
public:
host: drydock-sw.DOMAIN
maas_region:
name: maas-region
hosts:
default: maas-region-ui
default: maas-region
public: maas
path:
default: /MAAS
scheme:
default: "http"
port:
region_ui:
region_api:
default: 80
nodeport: 31900
podport: 80
public: 80
region_proxy:
default: 8000
host_fqdn_override:
default: null
public:
host: maas-sw.DOMAIN
maas_ingress:
hosts:
default: maas-ingress
error_pages: maas-ingress-error
host_fqdn_override:
public: null
port:
http:
default: 80
https:
default: 443
ingress_default_server:
default: 8383
error_pages:
default: 8080
podport: 8080
healthz:
podport: 10259
status:
podport: 18089
kubernetesprovisioner:
name: promenade
hosts:
@ -245,7 +282,7 @@ data:
host_fqdn_override:
default: null
public:
host: shipyard.DOMAIN
host: shipyard-sw.DOMAIN
prometheus_openstack_exporter:
namespace: ucp
hosts:
@ -269,7 +306,7 @@ data:
host_fqdn_override:
default: null
public:
host: object-store.DOMAIN
host: object-store-sw.DOMAIN
path:
default: /swift/v1
scheme:
@ -288,7 +325,7 @@ data:
host_fqdn_override:
default: null
public:
host: object-store.DOMAIN
host: object-store-sw.DOMAIN
path:
default: /auth/v1.0
scheme:
@ -456,7 +493,7 @@ data:
host_fqdn_override:
default: null
public:
host: object-store.DOMAIN
host: object-store-sw.DOMAIN
path:
default: /swift/v1/KEY_$(tenant_id)s
scheme:
@ -475,7 +512,7 @@ data:
host_fqdn_override:
default: null
public:
host: object-store.DOMAIN
host: object-store-sw.DOMAIN
path:
default: /auth/v1.0
scheme:
@ -555,9 +592,9 @@ data:
host_fqdn_override:
default: null
public:
host: identity.DOMAIN
host: identity-sw.DOMAIN
admin:
host: identity.DOMAIN
host: identity-sw.DOMAIN
path:
default: /v3
scheme:
@ -601,7 +638,7 @@ data:
host_fqdn_override:
default: null
public:
host: image.DOMAIN
host: image-sw.DOMAIN
path:
default: null
scheme:
@ -660,7 +697,7 @@ data:
host_fqdn_override:
default: null
public:
host: volume.DOMAIN
host: volume-sw.DOMAIN
path:
default: "/v1/%(tenant_id)s"
scheme:
@ -678,7 +715,7 @@ data:
host_fqdn_override:
default: null
public:
host: volume.DOMAIN
host: volume-sw.DOMAIN
path:
default: "/v2/%(tenant_id)s"
scheme:
@ -696,7 +733,7 @@ data:
host_fqdn_override:
default: null
public:
host: volume.DOMAIN
host: volume-sw.DOMAIN
path:
default: "/v3/%(tenant_id)s"
scheme:
@ -740,7 +777,7 @@ data:
host_fqdn_override:
default: null
public:
host: orchestration.DOMAIN
host: orchestration-sw.DOMAIN
path:
default: "/v1/%(project_id)s"
scheme:
@ -758,7 +795,7 @@ data:
host_fqdn_override:
default: null
public:
host: cloudformation.DOMAIN
host: cloudformation-sw.DOMAIN
path:
default: /v1
scheme:
@ -818,7 +855,7 @@ data:
host_fqdn_override:
default: null
public:
host: network.DOMAIN
host: network-sw.DOMAIN
path:
default: null
scheme:
@ -862,7 +899,7 @@ data:
host_fqdn_override:
default: null
public:
host: compute.DOMAIN
host: compute-sw.DOMAIN
path:
default: "/v2/%(tenant_id)s"
scheme:
@ -897,7 +934,7 @@ data:
host_fqdn_override:
default: null
public:
host: nova-novncproxy.DOMAIN
host: nova-novncproxy-sw.DOMAIN
path:
default: /vnc_auto.html
scheme:
@ -928,7 +965,7 @@ data:
host_fqdn_override:
default: null
public:
host: placement.DOMAIN
host: placement-sw.DOMAIN
path:
default: /
scheme:
@ -946,7 +983,7 @@ data:
host_fqdn_override:
default: null
public:
host: dashboard.DOMAIN
host: dashboard-sw.DOMAIN
path:
default: null
scheme:
@ -1123,7 +1160,7 @@ data:
host_fqdn_override:
default: null
public:
host: grafana.DOMAIN
host: grafana-sw.DOMAIN
path:
default: null
scheme:
@ -1159,7 +1196,7 @@ data:
host_fqdn_override:
default: null
public:
host: kibana.DOMAIN
host: kibana-sw.DOMAIN
path:
default: null
scheme:
@ -1261,7 +1298,7 @@ data:
host_fqdn_override:
default: null
public:
host: nagios.DOMAIN
host: nagios-sw.DOMAIN
path:
default: null
scheme:

147
site/airskiff/software/config/endpoints.yaml
View File

@ -1,4 +1,7 @@
---
# The purpose of this file is to define the site's endpoint catalog. This should
# not need to be modified for a new site.
# #GLOBAL-CANDIDATE#
schema: pegleg/EndpointCatalogue/v1
metadata:
schema: metadata/Document/v1
@ -19,6 +22,10 @@ metadata:
pattern: DOMAIN
- path: .ucp.shipyard.host_fqdn_override.public.host
pattern: DOMAIN
- path: .ucp.physicalprovisioner.host_fqdn_override.public.host
pattern: DOMAIN
- path: .ucp.maas_region.host_fqdn_override.public.host
pattern: DOMAIN
- path: .ceph.object_store.host_fqdn_override.public.host
pattern: DOMAIN
- path: .ceph.ceph_object_store.host_fqdn_override.public.host
@ -30,6 +37,7 @@ metadata:
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:
@ -39,6 +47,7 @@ metadata:
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:
@ -48,6 +57,7 @@ metadata:
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:
@ -61,9 +71,9 @@ data:
host_fqdn_override:
default: null
public:
host: iam.DOMAIN
host: iam-sw.DOMAIN
admin:
host: iam.DOMAIN
host: iam-sw.DOMAIN
path:
default: /v3
scheme:
@ -191,27 +201,57 @@ data:
api:
default: 9000
nodeport: 31900
public: 443
path:
default: /api/v1.0
scheme:
default: "http"
public: "https"
host_fqdn_override:
default: null
maas_region_ui:
name: maas-region-ui
public:
host: drydock-sw.DOMAIN
maas_region:
name: maas-region
hosts:
default: maas-region-ui
default: maas-region
public: maas
path:
default: /MAAS
scheme:
default: "http"
port:
region_ui:
region_api:
default: 80
nodeport: 31900
podport: 80
public: 80
region_proxy:
default: 8000
host_fqdn_override:
default: null
public:
host: maas-sw.DOMAIN
maas_ingress:
hosts:
default: maas-ingress
error_pages: maas-ingress-error
host_fqdn_override:
public: null
port:
http:
default: 80
https:
default: 443
ingress_default_server:
default: 8383
error_pages:
default: 8080
podport: 8080
healthz:
podport: 10259
status:
podport: 18089
kubernetesprovisioner:
name: promenade
hosts:
@ -242,7 +282,7 @@ data:
host_fqdn_override:
default: null
public:
host: shipyard.DOMAIN
host: shipyard-sw.DOMAIN
prometheus_openstack_exporter:
namespace: ucp
hosts:
@ -266,7 +306,7 @@ data:
host_fqdn_override:
default: null
public:
host: object-store.DOMAIN
host: object-store-sw.DOMAIN
path:
default: /swift/v1
scheme:
@ -285,7 +325,7 @@ data:
host_fqdn_override:
default: null
public:
host: object-store.DOMAIN
host: object-store-sw.DOMAIN
path:
default: /auth/v1.0
scheme:
@ -359,6 +399,24 @@ metadata:
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
@ -435,7 +493,7 @@ data:
host_fqdn_override:
default: null
public:
host: object-store.DOMAIN
host: object-store-sw.DOMAIN
path:
default: /swift/v1/KEY_$(tenant_id)s
scheme:
@ -454,7 +512,7 @@ data:
host_fqdn_override:
default: null
public:
host: object-store.DOMAIN
host: object-store-sw.DOMAIN
path:
default: /auth/v1.0
scheme:
@ -533,13 +591,18 @@ data:
internal: keystone-api
host_fqdn_override:
default: null
public:
host: identity-sw.DOMAIN
admin:
host: identity-sw.DOMAIN
path:
default: /v3
scheme:
default: "http"
default: "https"
internal: "http"
port:
api:
default: 80
default: 443
internal: 5000
glance_oslo_messaging:
namespace: openstack
@ -574,14 +637,17 @@ data:
public: glance
host_fqdn_override:
default: null
public:
host: image-sw.DOMAIN
path:
default: null
scheme:
default: "http"
public: "https"
port:
api:
default: 9292
public: 80
public: 443
image_registry:
name: glance-registry
hosts:
@ -631,7 +697,7 @@ data:
host_fqdn_override:
default: null
public:
host: volume.DOMAIN
host: volume-sw.DOMAIN
path:
default: "/v1/%(tenant_id)s"
scheme:
@ -649,7 +715,7 @@ data:
host_fqdn_override:
default: null
public:
host: volume.DOMAIN
host: volume-sw.DOMAIN
path:
default: "/v2/%(tenant_id)s"
scheme:
@ -667,7 +733,7 @@ data:
host_fqdn_override:
default: null
public:
host: volume.DOMAIN
host: volume-sw.DOMAIN
path:
default: "/v3/%(tenant_id)s"
scheme:
@ -710,14 +776,17 @@ data:
public: heat
host_fqdn_override:
default: null
public:
host: orchestration-sw.DOMAIN
path:
default: "/v1/%(project_id)s"
scheme:
default: "http"
public: "https"
port:
api:
default: 8004
public: 80
public: 443
cloudformation:
name: heat-cfn
hosts:
@ -725,6 +794,8 @@ data:
public: cloudformation
host_fqdn_override:
default: null
public:
host: cloudformation-sw.DOMAIN
path:
default: /v1
scheme:
@ -733,7 +804,7 @@ data:
port:
api:
default: 8000
public: 80
public: 443
cloudwatch:
name: heat-cloudwatch
hosts:
@ -783,14 +854,17 @@ data:
public: neutron
host_fqdn_override:
default: null
public:
host: network-sw.DOMAIN
path:
default: null
scheme:
default: "http"
public: "https"
port:
api:
default: 9696
public: 80
public: 443
nova_oslo_messaging:
namespace: openstack
hosts:
@ -824,16 +898,19 @@ data:
public: nova
host_fqdn_override:
default: null
public:
host: compute-sw.DOMAIN
path:
default: "/v2/%(tenant_id)s"
scheme:
default: "http"
public: "https"
port:
api:
default: 8774
public: 80
public: 443
novncproxy:
default: 6080
default: 443
compute_metadata:
name: nova
hosts:
@ -856,19 +933,21 @@ data:
public: novncproxy
host_fqdn_override:
default: null
public:
host: nova-novncproxy-sw.DOMAIN
path:
default: /vnc_auto.html
scheme:
default: "http"
public: "https"
port:
novnc_proxy:
default: 6080
public: 80
public: 443
compute_spice_proxy:
name: nova
hosts:
default: nova-spiceproxy
public: placement
host_fqdn_override:
default: null
path:
@ -885,14 +964,17 @@ data:
public: placement
host_fqdn_override:
default: null
public:
host: placement-sw.DOMAIN
path:
default: /
scheme:
default: "http"
public: "https"
port:
api:
default: 8778
public: 80
public: 443
dashboard:
name: horizon
hosts:
@ -901,7 +983,7 @@ data:
host_fqdn_override:
default: null
public:
host: dashboard.DOMAIN
host: dashboard-sw.DOMAIN
path:
default: null
scheme:
@ -1003,13 +1085,6 @@ data:
default: null
scheme:
default: "http"
port:
client:
default: 9200
http:
default: 80
discovery:
default: 9300
prometheus_elasticsearch_exporter:
namespace: null
hosts:
@ -1085,7 +1160,7 @@ data:
host_fqdn_override:
default: null
public:
host: grafana.DOMAIN
host: grafana-sw.DOMAIN
path:
default: null
scheme:
@ -1121,7 +1196,7 @@ data:
host_fqdn_override:
default: null
public:
host: kibana.DOMAIN
host: kibana-sw.DOMAIN
path:
default: null
scheme:
@ -1223,7 +1298,7 @@ data:
host_fqdn_override:
default: null
public:
host: nagios.DOMAIN
host: nagios-sw.DOMAIN
path:
default: null
scheme:

4
tools/gate/Jenkinsfile vendored
View File

@ -14,8 +14,8 @@ import groovy.json.JsonOutput
PEGLEG_IMAGE = 'quay.io/airshipit/pegleg:178c058474fb632806e281673d3eaf6be80fa854'
KEYSTONE_URL = 'https://iam.atlantafoundry.com'
SHIPYARD_URL = 'https://shipyard.atlantafoundry.com/api/v1.0'
KEYSTONE_URL = 'https://iam-sw.atlantafoundry.com'
SHIPYARD_URL = 'https://shipyard-sw.atlantafoundry.com/api/v1.0'
uuid = UUID.randomUUID().toString()
SITE_NAME='airship-seaworthy'

2
tools/openstack
View File

@ -11,7 +11,7 @@ OS_CLOUD_CFG=${HOME}/.openstack/clouds.yaml
: ${TERM_OPTS:=-it}
: ${OSH_KEYSTONE_URL:='https://identity.atlantafoundry.com/v3'}
: ${OSH_KEYSTONE_URL:='https://identity-sw.atlantafoundry.com/v3'}
: ${OSH_REGION_NAME:='airship-seaworthy'}
: ${OSH_ADMIN_PASSWD:='password123'}

2
tools/openstack-user-add
View File

@ -34,7 +34,7 @@ openstack quota set --floating-ips 4 ${OS_PROJ}
openstack quota set --cores 36 ${OS_PROJ}
openstack quota set --ram 98304 ${OS_PROJ}
echo https://dashboard.atlantafoundry.com/
echo https://dashboard-sw.atlantafoundry.com/
echo "Domain: ${OS_DOMAIN}"
echo "User: ${OS_USER}"
echo "Passwd: ${OS_PASSWD}"

34
type/sloop/config/endpoints.yaml
View File

@ -145,27 +145,53 @@ data:
api:
default: 9000
nodeport: 31900
public: 80
path:
default: /api/v1.0
scheme:
default: "http"
public: "http"
host_fqdn_override:
default: null
maas_region_ui:
name: maas-region-ui
maas_region:
name: maas-region
hosts:
default: maas-region-ui
default: maas-region
public: maas
path:
default: /MAAS
scheme:
default: "http"
port:
region_ui:
region_api:
default: 80
nodeport: 31900
podport: 80
public: 80
region_proxy:
default: 8000
host_fqdn_override:
default: null
maas_ingress:
hosts:
default: maas-ingress
error_pages: maas-ingress-error
host_fqdn_override:
public: null
port:
http:
default: 80
https:
default: 443
ingress_default_server:
default: 8383
error_pages:
default: 8080
podport: 8080
healthz:
podport: 10259
status:
podport: 18089
kubernetesprovisioner:
name: promenade
hosts: