diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-02-18 20:49:53 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-02-18 20:49:53 +0000 |
commit | d5b0c38f0b9ed0e7ca2eb4e1e2f6aaa003268b33 (patch) | |
tree | b17ad0da7ff43c7e7890b944cc5201c3ce9966f9 /ci/environments/scenario002-multinode.yaml | |
parent | f441f1a7856ad582c52641fd777fab03d13d9912 (diff) | |
parent | 4061dfe790f2614f253a6f0e14bf3dd056e20ce1 (diff) |
Merge "Switch to net-config-multinode"
Diffstat (limited to 'ci/environments/scenario002-multinode.yaml')
-rw-r--r-- | ci/environments/scenario002-multinode.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ci/environments/scenario002-multinode.yaml b/ci/environments/scenario002-multinode.yaml index bf4721e2..dfd534a8 100644 --- a/ci/environments/scenario002-multinode.yaml +++ b/ci/environments/scenario002-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::BarbicanApi: ../../puppet/services/barbican-api.yaml OS::TripleO::Services::Zaqar: ../../puppet/services/zaqar.yaml OS::TripleO::Services::Ec2Api: ../../puppet/services/ec2-api.yaml |