From c73a0be54f94398ca9fc7e2c35d91dfee17fb472 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Mon, 5 Oct 2020 18:07:27 +0200 Subject: [PATCH] Force CephAnsiblePlaybook to its default value on FFU prepare There is code in tripleo-ansible [1] which will look at if user customized the CephAnsiblePlaybook to run and, if so, will always use that instead of the special playbook we intend to use on _systemd or _fstobs tags. This change will reset param value to its default on FFU prepare so that we actually trigger the special playbooks later on in the process, whichever custom setting operators might have set via CephAnsiblePlaybook param for their Queens deployment. Closes-Bug: 1898589 1. https://github.com/openstack/tripleo-ansible/blob/master/tripleo_ansible/roles/tripleo_ceph_run_ansible/tasks/main.yml#L19 Change-Id: If3c0e12181bb926125eb8aa1014db35ed111ca35 (cherry picked from commit aafb509618b1c181b5eb373fabe510cad9ba8c8b) (cherry picked from commit 8571c5d90116c330d8752c222d9084c9d9335c7b) --- environments/lifecycle/update-prepare.yaml | 3 +++ environments/lifecycle/upgrade-prepare.yaml | 1 + 2 files changed, 4 insertions(+) diff --git a/environments/lifecycle/update-prepare.yaml b/environments/lifecycle/update-prepare.yaml index 025f6d29ff..5fc5b85dfb 100644 --- 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 diff --git a/environments/lifecycle/upgrade-prepare.yaml b/environments/lifecycle/upgrade-prepare.yaml index 9f0b837b14..addfd8016a 100644 --- 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: |