diff options
author | Emilien Macchi <emilien@redhat.com> | 2017-01-27 14:39:35 -0500 |
---|---|---|
committer | Emilien Macchi <emilien@redhat.com> | 2017-02-18 21:32:20 +0000 |
commit | 0d348d1777ef9cfcba74d0767790ea7f5cdeeed7 (patch) | |
tree | 229ccbea7bf0208d91d271523239af48d01a83d5 /ci/environments/scenario004-multinode.yaml | |
parent | edbaaa9e8546a60c6a95095fe174281410cfb009 (diff) |
Switch to net-config-multinode
Because of this bug:
https://bugs.launchpad.net/tripleo/+bug/1661412
We are unable to upgrade from Newton.
Until we figure this out, let's re-enable the previous SoftwareConfig.
Change-Id: I966b96c50224656b152045c97aa23b9495618a18
(cherry picked from commit 4061dfe790f2614f253a6f0e14bf3dd056e20ce1)
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 723a57b2..bec1d6d6 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-os-net-config.yaml - OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode-os-net-config.yaml + OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml + OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml OS::TripleO::Services::CephMds: ../../puppet/services/ceph-mds.yaml OS::TripleO::Services::CephMon: ../../puppet/services/ceph-mon.yaml OS::TripleO::Services::CephOSD: ../../puppet/services/ceph-osd.yaml |