diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-06-07 17:19:27 +0400 |
|---|---|---|
| committer |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-06-07 20:52:23 +0200 |
| commit | bf341b7e0d7e423044827f379e4b180e9dc897a1 (patch) | |
| tree | 948e8fc07d7dedfca428e8264196ec0f3b0c4641 /mcp/reclass/classes/cluster/mcp-common-ha/include | |
| parent | afae8d4d99d962448eb62cdd306f7a3dcda83744 (diff) | |
[ha] Update OpenStack version to Queens
* make cluster names version-agnostic
* switch to mirror.mirantis.com
* system reclass update
Change-Id: I96394b3c9d8d38321289af8e3a4e8bbc5dd7a408
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-common-ha/include')
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-common-ha/include/lab_proxy_pdf.yml.j2 | 25 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-common-ha/include/maas_proxy.yml | 25 |
2 files changed, 50 insertions, 0 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/include/lab_proxy_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/include/lab_proxy_pdf.yml.j2 new file mode 100644 index 000000000..3f238d667 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-common-ha/include/lab_proxy_pdf.yml.j2 @@ -0,0 +1,25 @@ +############################################################################## +# Copyright (c) 2018 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 +############################################################################## +--- +# We'll craft this class so it can be reused on both cfg01 and mas01 +{%- if conf.idf.fuel.network.upstream_proxy is defined %} +{%- set upstream_proxy=conf.idf.fuel.network.upstream_proxy %} +parameters: + maas: + region: + upstream_proxy: + address: {{ upstream_proxy.address }} + port: {{ upstream_proxy.port }} + linux: + system: + proxy: + pkg: + enabled: true + http: http://{{ upstream_proxy.address }}:{{ upstream_proxy.port }} + https: http://{{ upstream_proxy.address }}:{{ upstream_proxy.port }} +{%- endif %} diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/include/maas_proxy.yml b/mcp/reclass/classes/cluster/mcp-common-ha/include/maas_proxy.yml new file mode 100644 index 000000000..e5b263fe8 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-common-ha/include/maas_proxy.yml @@ -0,0 +1,25 @@ +############################################################################## +# Copyright (c) 2018 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: + pkg: + enabled: true + http: http://${_param:infra_maas_node01_deploy_address}:8000 + https: http://${_param:infra_maas_node01_deploy_address}:8000 |