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 "Template and role support for the undercloud"
[apex-tripleo-heat-templates.git]
/
environments
/
major-upgrade-pacemaker-converge.yaml
diff --git
a/environments/major-upgrade-pacemaker-converge.yaml
b/environments/major-upgrade-pacemaker-converge.yaml
index
dfcb965
..
e9a5f9b
100644
(file)
--- a/
environments/major-upgrade-pacemaker-converge.yaml
+++ b/
environments/major-upgrade-pacemaker-converge.yaml
@@
-1,6
+1,6
@@
parameter_defaults:
parameter_defaults:
- UpdateIdentifier: 'true'
UpgradeLevelNovaCompute: ''
resource_registry:
UpgradeLevelNovaCompute: ''
resource_registry:
- OS::TripleO::Tasks::PackageUpdate: ../extraconfig/tasks/yum_update_noop.yaml
+ OS::TripleO::Services::SaharaApi: ../puppet/services/sahara-api.yaml
+ OS::TripleO::Services::SaharaEngine: ../puppet/services/sahara-engine.yaml