Merge "Force CephAnsiblePlaybook to its default value on FFU prepare" into stable/ussuri

2020-10-29 03:01:29 +00:00 · 2020-10-29 03:01:29 +00:00 · 8bd91d2a10
parent dedf7f8d8b 6f70273467
commit 8bd91d2a10
2 changed files with 4 additions and 0 deletions
--- a/environments/lifecycle/update-prepare.yaml
+++ b/environments/lifecycle/update-prepare.yaml
@ -4,3 +4,6 @@
 resource_registry:
  OS::TripleO::Tasks::*PreConfig: OS::Heat::None
  OS::TripleO::Tasks::*PostConfig: OS::Heat::None
+
+parameter_defaults:
+  CephAnsiblePlaybook: default
--- a/environments/lifecycle/upgrade-prepare.yaml
+++ b/environments/lifecycle/upgrade-prepare.yaml
@ -8,6 +8,7 @@ resource_registry:
  OS::TripleO::Services::MongoDb: OS::Heat::None

 parameter_defaults:
+  CephAnsiblePlaybook: default
  EnablePackageInstall: true
  ServerDeletionPolicy: retain
  UpgradeLevelNovaCompute: auto