MAAS ingress related fixes for airship-in-a-bottle
Change-Id: I9f2c798ec41e95448f801344af5c30b25603c3c7
This commit is contained in:
parent
0517272333
commit
fc7e347226
|
@ -132,6 +132,7 @@ data:
|
|||
name: maas-region
|
||||
hosts:
|
||||
default: maas-region
|
||||
public: maas-region
|
||||
scheme:
|
||||
default: "http"
|
||||
port:
|
||||
|
|
|
@ -207,7 +207,7 @@ data:
|
|||
type: git
|
||||
maas:
|
||||
location: https://git.openstack.org/openstack/airship-maas
|
||||
reference: refs/changes/83/619283/11
|
||||
reference: 617607e42690befae69c86ad9b21134fdd467cbb
|
||||
subpath: charts/maas
|
||||
type: git
|
||||
maas-htk:
|
||||
|
@ -468,14 +468,14 @@ data:
|
|||
ks_service: docker.io/openstackhelm/heat:ocata
|
||||
ks_user: docker.io/openstackhelm/heat:ocata
|
||||
maas:
|
||||
bootstrap: quay.io/airshipit/maas-region-controller:2e003450cceb16b9bda71aa69a939a8466516582
|
||||
bootstrap: quay.io/airshipit/maas-region-controller:617607e42690befae69c86ad9b21134fdd467cbb
|
||||
db_init: docker.io/postgres:9.5
|
||||
db_sync: quay.io/airshipit/maas-region-controller:2e003450cceb16b9bda71aa69a939a8466516582
|
||||
db_sync: quay.io/airshipit/maas-region-controller:617607e42690befae69c86ad9b21134fdd467cbb
|
||||
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
|
||||
export_api_key: quay.io/airshipit/maas-region-controller:2e003450cceb16b9bda71aa69a939a8466516582
|
||||
maas_cache: quay.io/airshipit/sstream-cache:2e003450cceb16b9bda71aa69a939a8466516582
|
||||
maas_rack: docker.io/sthussey/maas-rack-controller:dev
|
||||
maas_region: quay.io/airshipit/maas-region-controller:2e003450cceb16b9bda71aa69a939a8466516582
|
||||
export_api_key: quay.io/airshipit/maas-region-controller:617607e42690befae69c86ad9b21134fdd467cbb
|
||||
maas_cache: quay.io/airshipit/sstream-cache:617607e42690befae69c86ad9b21134fdd467cbb
|
||||
maas_rack: quay.io/airshipit/maas-rack-controller:617607e42690befae69c86ad9b21134fdd467cbb
|
||||
maas_region: quay.io/airshipit/maas-region-controller:617607e42690befae69c86ad9b21134fdd467cbb
|
||||
promenade:
|
||||
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
|
||||
image_repo_sync: docker.io/docker:17.07.0
|
||||
|
|
|
@ -0,0 +1,33 @@
|
|||
---
|
||||
schema: armada/Chart/v1
|
||||
metadata:
|
||||
schema: metadata/Document/v1
|
||||
name: ingress-kube-system
|
||||
replacement: true
|
||||
layeringDefinition:
|
||||
abstract: false
|
||||
layer: site
|
||||
parentSelector:
|
||||
name: ingress-kube-system
|
||||
actions:
|
||||
- method: merge
|
||||
path: .
|
||||
storagePolicy: cleartext
|
||||
substitutions:
|
||||
# Chart source
|
||||
- src:
|
||||
schema: dev/Configurables/v1
|
||||
name: dev-configurables
|
||||
path: .hostcidr
|
||||
dest:
|
||||
path: .values.network.vip.addr
|
||||
pattern: REPLACEME
|
||||
data:
|
||||
values:
|
||||
network:
|
||||
ingress:
|
||||
disable-ipv6: "true"
|
||||
vip:
|
||||
manage: true
|
||||
addr: REPLACEME
|
||||
...
|
|
@ -0,0 +1,30 @@
|
|||
---
|
||||
schema: armada/Chart/v1
|
||||
metadata:
|
||||
schema: metadata/Document/v1
|
||||
name: ucp-maas
|
||||
replacement: true
|
||||
layeringDefinition:
|
||||
abstract: false
|
||||
layer: site
|
||||
parentSelector:
|
||||
name: ucp-maas
|
||||
actions:
|
||||
- method: merge
|
||||
path: .
|
||||
storagePolicy: cleartext
|
||||
substitutions:
|
||||
# Chart source
|
||||
- src:
|
||||
schema: dev/Configurables/v1
|
||||
name: dev-configurables
|
||||
path: .maas-ingress
|
||||
dest:
|
||||
path: .values.network.maas_ingress.addr
|
||||
pattern: REPLACEME
|
||||
data:
|
||||
values:
|
||||
network:
|
||||
maas_ingress:
|
||||
addr: REPLACEME
|
||||
...
|
|
@ -190,6 +190,7 @@ data:
|
|||
hostip: ${HOSTIP}
|
||||
hostcidr: ${HOSTCIDR}
|
||||
interface: ${NODE_NET_IFACE}
|
||||
maas-ingress: '192.169.1.5/32'
|
||||
EOF
|
||||
}
|
||||
|
||||
|
|
|
@ -67,7 +67,7 @@
|
|||
},
|
||||
"n0" : {
|
||||
"memory": 32768,
|
||||
"vcpus": 12,
|
||||
"vcpus": 16,
|
||||
"mac": "52:54:00:00:a4:31",
|
||||
"ip": "172.24.1.10",
|
||||
"io_profile": "fast",
|
||||
|
|
|
@ -19,4 +19,4 @@ source "${GATE_UTILS}"
|
|||
|
||||
cd "${TEMP_DIR}"
|
||||
|
||||
shipyard_action_wait deploy_site 3600
|
||||
shipyard_action_wait deploy_site 7200
|
||||
|
|
Loading…
Reference in New Issue