openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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
This commit is contained in:
Giulio Fidente 2020-10-05 18:07:27 +02:00
parent ab0d809fc9
commit aafb509618
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
environments/lifecycle/update-prepare.yaml
View File

@ -4,3 +4,6 @@
resource_registry: resource_registry:
OS::TripleO::Tasks::*PreConfig: OS::Heat::None OS::TripleO::Tasks::*PreConfig: OS::Heat::None
OS::TripleO::Tasks::*PostConfig: OS::Heat::None OS::TripleO::Tasks::*PostConfig: OS::Heat::None
parameter_defaults:
CephAnsiblePlaybook: default

1
environments/lifecycle/upgrade-prepare.yaml
View File

@ -8,6 +8,7 @@ resource_registry:
OS::TripleO::Services::MongoDb: OS::Heat::None OS::TripleO::Services::MongoDb: OS::Heat::None
parameter_defaults: parameter_defaults:
CephAnsiblePlaybook: default
EnablePackageInstall: true EnablePackageInstall: true
ServerDeletionPolicy: retain ServerDeletionPolicy: retain
UpgradeLevelNovaCompute: auto UpgradeLevelNovaCompute: auto