diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-02-02 13:31:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-02-02 13:31:41 +0000 |
| commit | 3474673e39339924e7725de6a70add2d8c0078cb (patch) | |
| tree | d93870e99e6e826982328605f589ed89aa97233c | |
| parent | 8a44985ed0d05643f53ba3becdaf2a5f97a6d389 (diff) | |
| parent | 79f148b4d7a0987dbeee5b70aa5d057848c692bf (diff) | |
Merge "Use common directory in CI scenario for net-config"
| -rw-r--r-- | ci/environments/multinode_major_upgrade.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
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: |