From: Mathieu Bultel Date: Tue, 31 Jan 2017 08:09:14 +0000 (+0100) Subject: Use common directory in CI scenario for net-config X-Git-Tag: opnfv-6.0.0~1135^2 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=79f148b4d7a0987dbeee5b70aa5d057848c692bf;p=apex-tripleo-heat-templates.git Use common directory in CI scenario for net-config The multinode_major_upgrade scenario is using an external directory for net-config. Moving this to the internal directory in tht common/ Change-Id: I41692d2ddb9fbd2002fd7910933ab4edff74f33e --- diff --git a/ci/environments/multinode_major_upgrade.yaml b/ci/environments/multinode_major_upgrade.yaml index 04a9420c..520a0c65 100644 --- a/ci/environments/multinode_major_upgrade.yaml +++ b/ci/environments/multinode_major_upgrade.yaml @@ -1,6 +1,6 @@ resource_registry: - OS::TripleO::Controller::Net::SoftwareConfig: ../heat-templates/net-config-multinode.yaml - OS::TripleO::Compute::Net::SoftwareConfig: ../heat-templates/net-config-multinode.yaml + OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml + OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml OS::TripleO::Services::Core: multinode-core.yaml parameter_defaults: