088d5c12f0
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
12 lines
449 B
YAML
12 lines
449 B
YAML
resource_registry:
|
|
OS::TripleO::SoftwareDeployment: ../config-download-structured.yaml
|
|
OS::TripleO::StructuredDeployment: ../config-download-structured.yaml
|
|
|
|
OS::Heat::SoftwareDeployment: ../config-download-software.yaml
|
|
OS::Heat::StructuredDeployment: ../config-download-structured.yaml
|
|
|
|
OS::TripleO::DeploymentSteps: OS::Heat::None
|
|
|
|
OS::TripleO::Ssh::KnownHostsDeployment: OS::Heat::None
|
|
OS::TripleO::Ssh::HostPubKey: OS::Heat::None
|