summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_interface_vcp_biport.yml
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/openstack_interface_vcp_biport.yml
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/openstack_interface_vcp_biport.yml')
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_interface_vcp_biport.yml3
1 files changed, 2 insertions, 1 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_interface_vcp_biport.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_interface_vcp_biport.yml
index 572aa7d25..1a3a8c112 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_interface_vcp_biport.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_interface_vcp_biport.yml
@@ -7,7 +7,8 @@
##############################################################################
---
classes:
- - 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:
dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}