Uplift to latest MAAS and enable Built-in proxy
Change-Id: I5cbca04b95b1064c4d59054f1cb830fce11edd86
This commit is contained in:
parent
55c457fbdd
commit
714f436492
|
@ -68,7 +68,7 @@ metadata:
|
||||||
name: common-addresses
|
name: common-addresses
|
||||||
path: .node_ports.maas_proxy
|
path: .node_ports.maas_proxy
|
||||||
dest:
|
dest:
|
||||||
path: .values.network.proxy.node_port.port
|
path: .values.network.port.service_proxy
|
||||||
|
|
||||||
# MaaS Config
|
# MaaS Config
|
||||||
- src:
|
- src:
|
||||||
|
@ -195,7 +195,10 @@ data:
|
||||||
url:
|
url:
|
||||||
maas_url: http://MAAS_IP:MAAS_PORT/MAAS
|
maas_url: http://MAAS_IP:MAAS_PORT/MAAS
|
||||||
proxy:
|
proxy:
|
||||||
proxy_enabled: 'false'
|
# Use MAAS Built-in proxy. This supports environments where
|
||||||
|
# the PXE interface can not reach the internet.
|
||||||
|
# Also improves efficiency due to caching via MAAS.
|
||||||
|
proxy_enabled: 'true'
|
||||||
ntp:
|
ntp:
|
||||||
use_external_only: 'true'
|
use_external_only: 'true'
|
||||||
disable_ntpd_region: true
|
disable_ntpd_region: true
|
||||||
|
|
|
@ -338,7 +338,7 @@ data:
|
||||||
type: git
|
type: git
|
||||||
maas:
|
maas:
|
||||||
location: https://git.openstack.org/openstack/airship-maas
|
location: https://git.openstack.org/openstack/airship-maas
|
||||||
reference: cdfb1737da21bbb097113a6aaeaae37117038781
|
reference: d1d5b88d3db637a3fa6671a0cd04f9c817a749da
|
||||||
subpath: charts/maas
|
subpath: charts/maas
|
||||||
type: git
|
type: git
|
||||||
maas-htk:
|
maas-htk:
|
||||||
|
@ -777,14 +777,14 @@ data:
|
||||||
rabbit_init: docker.io/rabbitmq:3.7-management
|
rabbit_init: docker.io/rabbitmq:3.7-management
|
||||||
test: docker.io/kolla/ubuntu-source-rally:4.0.0
|
test: docker.io/kolla/ubuntu-source-rally:4.0.0
|
||||||
maas:
|
maas:
|
||||||
bootstrap: quay.io/airshipit/maas-region-controller:cdfb1737da21bbb097113a6aaeaae37117038781
|
bootstrap: quay.io/airshipit/maas-region-controller:d1d5b88d3db637a3fa6671a0cd04f9c817a749da
|
||||||
db_init: docker.io/postgres:9.5
|
db_init: docker.io/postgres:9.5
|
||||||
db_sync: quay.io/airshipit/maas-region-controller:cdfb1737da21bbb097113a6aaeaae37117038781
|
db_sync: quay.io/airshipit/maas-region-controller:d1d5b88d3db637a3fa6671a0cd04f9c817a749da
|
||||||
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
|
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
|
||||||
export_api_key: quay.io/airshipit/maas-region-controller:cdfb1737da21bbb097113a6aaeaae37117038781
|
export_api_key: quay.io/airshipit/maas-region-controller:d1d5b88d3db637a3fa6671a0cd04f9c817a749da
|
||||||
maas_cache: quay.io/airshipit/sstream-cache:cdfb1737da21bbb097113a6aaeaae37117038781
|
maas_cache: quay.io/airshipit/sstream-cache:d1d5b88d3db637a3fa6671a0cd04f9c817a749da
|
||||||
maas_rack: quay.io/airshipit/maas-rack-controller:cdfb1737da21bbb097113a6aaeaae37117038781
|
maas_rack: quay.io/airshipit/maas-rack-controller:d1d5b88d3db637a3fa6671a0cd04f9c817a749da
|
||||||
maas_region: quay.io/airshipit/maas-region-controller:cdfb1737da21bbb097113a6aaeaae37117038781
|
maas_region: quay.io/airshipit/maas-region-controller:d1d5b88d3db637a3fa6671a0cd04f9c817a749da
|
||||||
mariadb:
|
mariadb:
|
||||||
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
|
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
|
||||||
error_pages: gcr.io/google-containers/defaultbackend:1.0
|
error_pages: gcr.io/google-containers/defaultbackend:1.0
|
||||||
|
|
|
@ -10,8 +10,6 @@ metadata:
|
||||||
parentSelector:
|
parentSelector:
|
||||||
name: ucp-maas-global
|
name: ucp-maas-global
|
||||||
actions:
|
actions:
|
||||||
- method: replace
|
|
||||||
path: .values.conf.maas.proxy
|
|
||||||
- method: merge
|
- method: merge
|
||||||
path: .
|
path: .
|
||||||
storagePolicy: cleartext
|
storagePolicy: cleartext
|
||||||
|
@ -23,15 +21,4 @@ data:
|
||||||
default_os: 'ubuntu'
|
default_os: 'ubuntu'
|
||||||
default_image: 'xenial'
|
default_image: 'xenial'
|
||||||
default_kernel: 'hwe-16.04'
|
default_kernel: 'hwe-16.04'
|
||||||
proxy:
|
|
||||||
# Whether deploying nodes should use MaaS region as an APT proxy.
|
|
||||||
proxy_enabled: false
|
|
||||||
# NEWSITE-CHANGEME: Whether MaaS region should utilize an external proxy
|
|
||||||
# for accessing repos. Set to 'true' if your environment needs a proxy
|
|
||||||
# to get to the upstream package mirrors, and false otherwise.
|
|
||||||
peer_proxy_enabled: false
|
|
||||||
# NEWSITE-CHANGEME: If your site requires a proxy to reach upstream
|
|
||||||
# package mirrors, enter the proxy information here. Otherwise, comment
|
|
||||||
# out this line.
|
|
||||||
# proxy_server: http://proxy.example.com:8080
|
|
||||||
...
|
...
|
||||||
|
|
Loading…
Reference in New Issue