diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-02-19 12:22:35 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-02-19 12:22:36 +0000 |
| commit | 724890ecec8bb467947b3dcb20a59962273ffbcb (patch) | |
| tree | bf4478ae8356c7ac6af97d81cae9cd01dcba9f2d /mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.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/infra/kvm.yml')
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml | 3 |
1 files changed, 2 insertions, 1 deletions
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 |