Browse Source

Merge "Uplift MAAS and fixes for maas-ingress"

changes/01/670901/8
Zuul 2 years ago
committed by Gerrit Code Review
parent
commit
38cc109fb1
  1. 2
      global/software/config/versions.yaml
  2. 63
      type/sloop/charts/ucp/comps/maas.yaml

2
global/software/config/versions.yaml

@ -433,7 +433,7 @@ data:
type: git
maas:
location: https://opendev.org/airship/maas
reference: c84a5b64de0bf9bcf72b88bdbb81fc13d69a86aa
reference: 922db8aee15f978b9e58a9a2a1c0052febc41aa8
subpath: charts/maas
type: git
maas-htk:

63
type/sloop/charts/ucp/comps/maas.yaml

@ -13,7 +13,15 @@ metadata:
name: ucp-maas-global
actions:
- method: merge
path: .
path: .values.manifests
- method: merge
path: .values.network
- method: merge
path: .values.conf
- method: replace
path: .values.dependencies.static
- method: replace
path: .values.endpoints.maas_ingress.hosts
storagePolicy: cleartext
substitutions:
@ -88,4 +96,57 @@ data:
namespace: ucp
url:
maas_url: http://MAAS_IP:MAAS_PORT/MAAS
dependencies:
static:
maas_ingress: {}
rack_controller:
services:
- service: maas_region
endpoint: internal
jobs:
- maas-export-api-key
region_controller:
jobs:
- maas-db-sync
services:
- service: maas_db
endpoint: internal
db_init:
services:
- service: maas_db
endpoint: internal
db_sync:
jobs:
- maas-db-init
bootstrap_admin_user:
jobs:
- maas-db-sync
services:
- service: maas_region
endpoint: internal
- service: maas_db
endpoint: internal
import_resources:
jobs:
- maas-bootstrap-admin-user
services:
- service: maas_region
endpoint: internal
- service: maas_db
endpoint: internal
export_api_key:
jobs:
- maas-bootstrap-admin-user
services:
- service: maas_region
endpoint: internal
- service: maas_db
endpoint: internal
endpoints:
maas_ingress:
hosts:
default: maas-ingress
error_pages: maas-ingress-error
...
Loading…
Cancel
Save