diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-25 16:48:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-04-25 16:48:39 +0000 |
| commit | 1822ab1c4a201ac952200b52ab600661ea3fea97 (patch) | |
| tree | ac3eb413abc8288f335ef7f7a6bfaa3071bb552c /overcloud-resource-registry-puppet.j2.yaml | |
| parent | 374b101683eb695b4aad44cb086c1a1748042d12 (diff) | |
| parent | 68d7196d472b5195c19e871e960996e89a7bcb9c (diff) | |
Merge "SSH known_hosts config" into stable/ocata
Diffstat (limited to 'overcloud-resource-registry-puppet.j2.yaml')
| -rw-r--r-- | overcloud-resource-registry-puppet.j2.yaml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 65a727ed..a8bfa94c 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -5,6 +5,8 @@ resource_registry: OS::TripleO::PostUpgradeSteps: puppet/post-upgrade.yaml OS::TripleO::AllNodes::SoftwareConfig: puppet/all-nodes-config.yaml OS::TripleO::Hosts::SoftwareConfig: hosts-config.yaml + OS::TripleO::Ssh::HostPubKey: extraconfig/tasks/ssh/host_public_key.yaml + OS::TripleO::Ssh::KnownHostsConfig: extraconfig/tasks/ssh/known_hosts_config.yaml OS::TripleO::DefaultPasswords: default_passwords.yaml # Tasks (for internal TripleO usage) |