Merge "[lab-config] Use Pharos submodule by default"
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Thu, 25 Jan 2018 18:33:21 +0000 (18:33 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 25 Jan 2018 18:33:21 +0000 (18:33 +0000)
1  2 
ci/deploy.sh
mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/compute_pdf.yml.j2
mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2

diff --cc ci/deploy.sh
Simple merge