Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Remove unused nova_url from neutron config"
[apex-tripleo-heat-templates.git]
/
ci
/
environments
/
multinode_major_upgrade.yaml
diff --git
a/ci/environments/multinode_major_upgrade.yaml
b/ci/environments/multinode_major_upgrade.yaml
index
04a9420
..
56d04de
100644
(file)
--- a/
ci/environments/multinode_major_upgrade.yaml
+++ b/
ci/environments/multinode_major_upgrade.yaml
@@
-1,6
+1,6
@@
resource_registry:
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:
OS::TripleO::Services::Core: multinode-core.yaml
parameter_defaults:
@@
-45,3
+45,4
@@
parameter_defaults:
nova::compute::libvirt::libvirt_cpu_mode: 'none'
heat::rpc_response_timeout: 600
SwiftCeilometerPipelineEnabled: False
nova::compute::libvirt::libvirt_cpu_mode: 'none'
heat::rpc_response_timeout: 600
SwiftCeilometerPipelineEnabled: False
+ Debug: True