diff options
author | 2018-02-19 12:22:35 +0000 | |
---|---|---|
committer | 2018-02-19 12:22:36 +0000 | |
commit | 724890ecec8bb467947b3dcb20a59962273ffbcb (patch) | |
tree | bf4478ae8356c7ac6af97d81cae9cd01dcba9f2d /mcp/reclass/classes/cluster/mcp-pike-common-ha/include/maas_proxy.yml | |
parent | 00839253ec6cc31fdabe7cacdc23b9ffadfb2bba (diff) | |
parent | 5acee090a5ecd7bcb5d66769ff83ef37e8e43dae (diff) |
Merge changes from topics 'lab-proxy-keyserver', 'maas-override-failed-testing'
* changes:
[baremetal] Use upstream lab proxy for keyservers
[MaaS] Override failed testing by default
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-pike-common-ha/include/maas_proxy.yml')
-rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-common-ha/include/maas_proxy.yml | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/include/maas_proxy.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/include/maas_proxy.yml new file mode 100644 index 000000000..3c324db8b --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/include/maas_proxy.yml @@ -0,0 +1,24 @@ +############################################################################## +# Copyright (c) 2017 Mirantis Inc., Enea AB and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +parameters: + # NOTE: Apt proxy is set by curtin, Salt minion proxy is configured below, + # only enable proxy via /etc/environment if you need it for smth else + # linux: + # system: + # env: + # http_proxy: http://${_param:infra_maas_node01_deploy_address}:8000 + # https_proxy: http://${_param:infra_maas_node01_deploy_address}:8000 + # no_proxy: + # - .local + linux: + system: + proxy: + keyserver: + http: http://${_param:infra_maas_node01_deploy_address}:8000 + https: http://${_param:infra_maas_node01_deploy_address}:8000 |