aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-02-19 12:22:35 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-02-19 12:22:36 +0000
commit724890ecec8bb467947b3dcb20a59962273ffbcb (patch)
treebf4478ae8356c7ac6af97d81cae9cd01dcba9f2d /mcp/reclass/classes/cluster/mcp-pike-common-ha/infra
parent00839253ec6cc31fdabe7cacdc23b9ffadfb2bba (diff)
parent5acee090a5ecd7bcb5d66769ff83ef37e8e43dae (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/infra')
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/config.yml2
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml3
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/lab_proxy_pdf.yml.j224
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml2
4 files changed, 4 insertions, 27 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/config.yml
index 0fb8e6418..5e416c907 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/config.yml
@@ -25,7 +25,7 @@ classes:
# - system.reclass.storage.system.stacklight_monitor_cluster
# - system.reclass.storage.system.stacklight_telemetry_cluster
- system.reclass.storage.system.infra_maas_single
- - cluster.mcp-pike-common-ha.infra.lab_proxy_pdf
+ - cluster.mcp-pike-common-ha.include.lab_proxy_pdf
parameters:
_param:
salt_master_base_environment: prd
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml
index 9f85366c8..b6fb573e8 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml
@@ -22,7 +22,8 @@ classes:
# - system.salt.control.cluster.stacklight_log_cluster
# - system.salt.control.cluster.stacklight_telemetry_cluster
- cluster.mcp-pike-common-ha.infra.kvm_pdf
- - cluster.mcp-pike-common-ha.include.proxy
+ - cluster.mcp-pike-common-ha.include.maas_proxy
+ - cluster.mcp-pike-common-ha.include.lab_proxy_pdf
parameters:
_param:
linux_system_codename: xenial
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/lab_proxy_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/lab_proxy_pdf.yml.j2
deleted file mode 100644
index 0e95d2d1d..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/lab_proxy_pdf.yml.j2
+++ /dev/null
@@ -1,24 +0,0 @@
-##############################################################################
-# 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:
- keyserver:
- 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-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml
index 3dc99983c..438915c1f 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml
@@ -9,7 +9,7 @@
classes:
- system.maas.region.single
- service.maas.cluster.single
- - cluster.mcp-pike-common-ha.infra.lab_proxy_pdf
+ - cluster.mcp-pike-common-ha.include.lab_proxy_pdf
- cluster.mcp-pike-common-ha.infra.maas_pdf
parameters:
_param: