This is a queens only modified version of
https://review.opendev.org/682644 due to the different deployment
methods we have there.
When the compute bootstrap node gets blacklisted or deployment is
run with skip-deploy-identifier the discovery job we have in step_5
won't run. This runs the the discovery via an ansible playbook to
make sure it runs in this conditions.
In case of default deploy method the discovery is run by the
In case of config-download the discovery is run via the
HostPrepConfig was using the old way (Heat) to run Ansible. We don't
need it anymore when using config-download.
This is an equivalent backport of
I2041e6892de76b0ed04d7497e3f9064bfaf58270 (why the same change-id is
used here). That patch can not just be backported as-is to stable/queens
because the non-config-download mechanism still needs to work, so we can
not just remove the resources.
Instead, we provide a new mapping that is set to OS::Heat::None when
config-download is activated with the environment file.
While backporting config-download support for NFV from rocky, the
default option is to use config-download. But in queens the default
option is to use heat with an opt-in config-download support. Disable
config-download based resources and provide an option to enable via
Add support for the SshKnownHostsDeployment resources to
config-download. Since the deployment resources relied on Heat outputs,
they were not supported with the default handling from tripleo-common
that relies on the group_vars mechanism.
Instead, this patch refactors the templates to add the known hosts
entries as global_vars to deploy_steps_playbook.yaml, and then includes
the new tripleo-ssh-known-hosts role from tripleo-common to apply the
same configuration that the Heat deployment did.
Since these deployments no longer need to be triggered when including
config-download-environment.yaml, a mapping is added that can be
overridden to OS::Heat::None to disable the deployment resources when
The default behavior when not using config-download remains unchanged.
(cherry picked from commit 088d5c12f0)
Presently, "openstack overcloud config download" does not support all
Deployment resources, only those included in the RoleData and are
natively of type group:ansible.
This patch adds support for also pulling all the deployment data for
OS::Heat::SoftwareDeployment (singular) resources applied to individual
servers of any group type. Those resources are mapped to a new nested
stack via the config-download-environment.yaml environment.
The nested stack has the same interface as a SoftwareDeployment but only
creates a OS::Heat::Value resource. The "config download" code will be
updated in a separate patch to read the deployment data from these Value
resources and apply them via ansible.
The related tripleo-common patch (which depends on this patch) is:
implements: blueprint ansible-config-download