From ffdf2407d0df1909b7f3d08487c3e5a14c5f47fd Mon Sep 17 00:00:00 2001 From: Kaspars Skels Date: Thu, 18 Apr 2019 15:42:52 -0500 Subject: [PATCH] Support latest MAAS in Airsloop Change-Id: Id259135582858fc7af40702678e953197c838fa9 --- global/software/config/versions.yaml | 2 +- type/sloop/charts/ucp/comps/drydock.yaml | 28 ++++++++++ type/sloop/charts/ucp/comps/maas.yaml | 68 ++++++++++++++++++++++++ type/sloop/config/endpoints.yaml | 2 +- 4 files changed, 98 insertions(+), 2 deletions(-) diff --git a/global/software/config/versions.yaml b/global/software/config/versions.yaml index 5db91a84e..c47302c9c 100644 --- a/global/software/config/versions.yaml +++ b/global/software/config/versions.yaml @@ -353,7 +353,7 @@ data: type: git maas: location: https://opendev.org/airship/maas - reference: 2910412699231f8818a6c1b56e86c985da7f3717 + reference: 407d4ccfb41637d46483b319c0b401459523e272 subpath: charts/maas type: git maas-htk: diff --git a/type/sloop/charts/ucp/comps/drydock.yaml b/type/sloop/charts/ucp/comps/drydock.yaml index 987a05628..6bd79187f 100644 --- a/type/sloop/charts/ucp/comps/drydock.yaml +++ b/type/sloop/charts/ucp/comps/drydock.yaml @@ -13,8 +13,36 @@ metadata: - method: merge path: . storagePolicy: cleartext + substitutions: + + # 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' + data: values: + network: + api: + nodeport: + enabled: true replicas: drydock: 1 + conf: + drydock: + database: + pool_size: 200 + maasdriver: + maas_api_url: http://MAAS_IP:MAAS_PORT/MAAS ... diff --git a/type/sloop/charts/ucp/comps/maas.yaml b/type/sloop/charts/ucp/comps/maas.yaml index f9fd1d6aa..513ae3b9f 100644 --- a/type/sloop/charts/ucp/comps/maas.yaml +++ b/type/sloop/charts/ucp/comps/maas.yaml @@ -13,12 +13,80 @@ metadata: - method: merge path: . storagePolicy: cleartext + substitutions: + + # 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.endpoints.maas_region.port.region_api.nodeport + - src: + schema: pegleg/CommonAddresses/v1 + name: common-addresses + path: .node_ports.maas_proxy + dest: + path: .values.endpoints.maas_region.port.region_proxy.default data: values: + manifests: + maas_ingress: false + + network: + region_proxy: + node_port: + enabled: true + region_api: + ingress: + public: false + node_port: + enabled: true + conf: maas: images: default_os: 'ubuntu' default_image: 'xenial' default_kernel: 'ga-16.04' + cache: + enabled: true + drydock: + bootaction_url: http://DRYDOCK_IP:DRYDOCK_PORT/api/v1.0 + maas: + credentials: + secret: + namespace: ucp + url: + maas_url: http://MAAS_IP:MAAS_PORT/MAAS ... diff --git a/type/sloop/config/endpoints.yaml b/type/sloop/config/endpoints.yaml index 0f1f52919..c9427d414 100644 --- a/type/sloop/config/endpoints.yaml +++ b/type/sloop/config/endpoints.yaml @@ -157,7 +157,7 @@ data: name: maas-region hosts: default: maas-region - public: maas + public: maas-region path: default: /MAAS scheme: