diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-01-27 17:52:29 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-01-27 17:52:29 +0000 |
| commit | 5084b372dcecc1dad19f22b1382804b1ea2a676d (patch) | |
| tree | 94b4dea44392507a023ec91c193658b9eaae947d /ci/environments/scenario004-multinode.yaml | |
| parent | 6bdfd93c9ca0308200fb85b856d8a829d7c32aba (diff) | |
| parent | 1dd364fc8aea3305faa039524dc09ab1078237bb (diff) | |
Merge "Use os-net-config in multinode jobs"
Diffstat (limited to 'ci/environments/scenario004-multinode.yaml')
| -rw-r--r-- | ci/environments/scenario004-multinode.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ci/environments/scenario004-multinode.yaml b/ci/environments/scenario004-multinode.yaml index e97113b0..5b253a84 100644 --- a/ci/environments/scenario004-multinode.yaml +++ b/ci/environments/scenario004-multinode.yaml @@ -1,6 +1,6 @@ resource_registry: - OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml - OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml + OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode-os-net-config.yaml + OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode-os-net-config.yaml OS::TripleO::Services::CephMon: /usr/share/openstack-tripleo-heat-templates/puppet/services/ceph-mon.yaml OS::TripleO::Services::CephOSD: /usr/share/openstack-tripleo-heat-templates/puppet/services/ceph-osd.yaml OS::TripleO::Services::CephClient: /usr/share/openstack-tripleo-heat-templates/puppet/services/ceph-client.yaml |