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
Add replacepkgs to the manual ovs upgrade workaround and fix a typo
[apex-tripleo-heat-templates.git]
/
extraconfig
/
tasks
/
major_upgrade_pacemaker.yaml
diff --git
a/extraconfig/tasks/major_upgrade_pacemaker.yaml
b/extraconfig/tasks/major_upgrade_pacemaker.yaml
index
30ae8d1
..
7c78d5a
100644
(file)
--- a/
extraconfig/tasks/major_upgrade_pacemaker.yaml
+++ b/
extraconfig/tasks/major_upgrade_pacemaker.yaml
@@
-22,6
+22,11
@@
parameters:
type: boolean
default: false
description: If enabled, Ceph upgrade will be forced even though cluster or PGs status is not clean
type: boolean
default: false
description: If enabled, Ceph upgrade will be forced even though cluster or PGs status is not clean
+ KeepSaharaServicesOnUpgrade:
+ type: boolean
+ default: true
+ description: Whether to keep Sahara services when upgrading controller nodes from mitaka to newton
+
resources:
# TODO(jistr): for Mitaka->Newton upgrades and further we can use
resources:
# TODO(jistr): for Mitaka->Newton upgrades and further we can use
@@
-127,7
+132,13
@@
resources:
config:
list_join:
- ''
config:
list_join:
- ''
- - - get_file: pacemaker_common_functions.sh
+ - - str_replace:
+ template: |
+ #!/bin/bash
+ keep_sahara_services_on_upgrade='KEEP_SAHARA_SERVICES_ON_UPGRADE'
+ params:
+ KEEP_SAHARA_SERVICES_ON_UPGRADE: {get_param: KeepSaharaServicesOnUpgrade}
+ - get_file: pacemaker_common_functions.sh
- get_file: major_upgrade_pacemaker_migrations.sh
- get_file: major_upgrade_controller_pacemaker_3.sh
- get_file: major_upgrade_pacemaker_migrations.sh
- get_file: major_upgrade_controller_pacemaker_3.sh