From aafb509618b1c181b5eb373fabe510cad9ba8c8b 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 --- 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 2255988964..7ad9f1070f 100644 --- 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