openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Remove redundant *_migration_ssh_inbound_addr"

This commit is contained in:
Zuul 2022-06-05 19:42:54 +00:00 committed by Gerrit Code Review
parent 1b0bd3cef1 de96a96f4b
commit 981cabdc3d
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
deployment/nova/nova-migration-target-container-puppet.yaml
View File

@ -111,20 +111,16 @@ outputs:
tripleo::profile::base::nova::migration::target::ssh_authorized_keys:
- {get_param: [ MigrationSshKey, public_key ]}
tripleo::profile::base::nova::migration::target::ssh_localaddrs:
- "%{lookup('cold_migration_ssh_inbound_addr')}"
- "%{lookup('live_migration_ssh_inbound_addr')}"
live_migration_ssh_inbound_addr:
str_replace:
template:
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
cold_migration_ssh_inbound_addr:
str_replace:
template:
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, NovaApiNetwork]}
- str_replace:
template:
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, NovaApiNetwork]}
- str_replace:
template:
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
tripleo::profile::base::sshd::port:
- 22
tripleo::profile::base::sshd::password_authentication: 'no'