aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-08-22 13:55:45 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-08-22 13:55:45 +0000
commit0f9744c1fd97bfd102d14104516059b17190b288 (patch)
tree42da2cd0088d843894697eabde0cdfd60472b430 /mcp/reclass/classes
parentc66828df53e4eff4d9cfdde7b3f5ae3dc5a3883c (diff)
parent7065efb23b90af91f171476360e75602a1205c13 (diff)
Merge ".gitignore refresh, fold common expressions"
Diffstat (limited to 'mcp/reclass/classes')
-rw-r--r--mcp/reclass/classes/cluster/.gitignore10
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml.j2 (renamed from mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml)0
2 files changed, 2 insertions, 8 deletions
diff --git a/mcp/reclass/classes/cluster/.gitignore b/mcp/reclass/classes/cluster/.gitignore
index 733689355..9266b7cbc 100644
--- a/mcp/reclass/classes/cluster/.gitignore
+++ b/mcp/reclass/classes/cluster/.gitignore
@@ -12,15 +12,9 @@ mcp*common-*/openstack_init.yml
mcp-common-ha/openstack_interface_vcp_biport.yml
mcp-common-ha/openstack_interface_vcp_triport.yml
mcp-common-ha/openstack_proxy.yml
-mcp-ovs-ha/infra/init_vcp.yml
-mcp-ovs-ha/infra/kvm.yml
-mcp-ovs-dpdk-ha/infra/init_vcp.yml
-mcp-ovs-dpdk-ha/infra/kvm.yml
-mcp-odl-ha/infra/init_vcp.yml
-mcp-odl-ha/infra/kvm.yml
+mcp-*-ha/infra/kvm.yml
+mcp-*-ha/infra/init_vcp.yml
mcp-odl-ha/infra/maas.yml
-mcp-ovn-ha/infra/init_vcp.yml
-mcp-ovn-ha/infra/kvm.yml
mcp-odl-ha/opendaylight/control.yml
mcp-odl-ha/openstack/init.yml
mcp-odl-noha/infra/config.yml
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml.j2
index 62af0893a..62af0893a 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml.j2