commit 54010e2358850df97d34f5f9e67b89a800dba67d
Author: James Slagle <email address hidden>
Date: Fri Jan 12 15:52:26 2018 -0500
Support SshKnownHostsDeployment with config-download
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
using config-download.
The default behavior when not using config-download remains unchanged.
Closes-Bug: #1746336
Change-Id: Ia334fe6adc9a8ab228f75cb1d0c441c1344e2bd9
(cherry picked from commit 088d5c12f0f37e24d836e6f8791f41fbeba3326d)
Reviewed: https:/ /review. openstack. org/582424 /git.openstack. org/cgit/ openstack/ tripleo- heat-templates/ commit/ ?id=54010e23588 50df97d34f5f9e6 7b89a800dba67d
Committed: https:/
Submitter: Zuul
Branch: stable/queens
commit 54010e2358850df 97d34f5f9e67b89 a800dba67d
Author: James Slagle <email address hidden>
Date: Fri Jan 12 15:52:26 2018 -0500
Support SshKnownHostsDe ployment with config-download
Add support for the SshKnownHostsDe ployment resources to download. Since the deployment resources relied on Heat outputs,
config-
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 steps_playbook. yaml, and then includes ssh-known- hosts role from tripleo-common to apply the
entries as global_vars to deploy_
the new tripleo-
same configuration that the Heat deployment did.
Since these deployments no longer need to be triggered when including download- environment. yaml, a mapping is added that can be
config-
overridden to OS::Heat::None to disable the deployment resources when
using config-download.
The default behavior when not using config-download remains unchanged.
Closes-Bug: #1746336 b228f75cb1d0c44 1c1344e2bd9 4d836e6f8791f41 fbeba3326d)
Change-Id: Ia334fe6adc9a8a
(cherry picked from commit 088d5c12f0f37e2