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

12 months ago · 37cafea0b3
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
@ -9,6 +9,7 @@ resource_registry:

 parameter_defaults:
  UpgradeLeappCommandOptions: " --enablerepo rhel-8-for-x86_64-baseos-eus-rpms --enablerepo rhel-8-for-x86_64-appstream-eus-rpms --enablerepo rhel-8-for-x86_64-highavailability-eus-rpms --enablerepo advanced-virt-for-rhel-8-x86_64-rpms --enablerepo ansible-2.9-for-rhel-8-x86_64-rpms --enablerepo fast-datapath-for-rhel-8-x86_64-rpms "
+  CephAnsiblePlaybook: default
  EnablePackageInstall: true
  UpgradeLevelNovaCompute: ''
  UpgradeInitCommonCommand: |