aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services/nova-migration-target.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-10-10 01:12:03 +0000
committerGerrit Code Review <review@openstack.org>2017-10-10 01:12:03 +0000
commita7ac57e4b9d5a6a82e6826342d9afea88670c710 (patch)
treee23dc9f3e165867ddaeabb1f51dc007dc075f3e8 /puppet/services/nova-migration-target.yaml
parentbd2c98f10b48bbe40f0622f9164c608894d19808 (diff)
parent167e3d497c7cbdb687da0063060c4b0aac420558 (diff)
Merge "Fix cold/live migration network config" into stable/pike
Diffstat (limited to 'puppet/services/nova-migration-target.yaml')
-rw-r--r--puppet/services/nova-migration-target.yaml10
1 files changed, 8 insertions, 2 deletions
diff --git a/puppet/services/nova-migration-target.yaml b/puppet/services/nova-migration-target.yaml
index 0c2b419e..e121d37a 100644
--- a/puppet/services/nova-migration-target.yaml
+++ b/puppet/services/nova-migration-target.yaml
@@ -55,8 +55,14 @@ outputs:
tripleo::profile::base::nova::migration::target::ssh_localaddrs:
- "%{hiera('cold_migration_ssh_inbound_addr')}"
- "%{hiera('live_migration_ssh_inbound_addr')}"
- live_migration_ssh_inbound_addr: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
- cold_migration_ssh_inbound_addr: {get_param: [ServiceNetMap, NovaColdMigrationNetwork]}
+ live_migration_ssh_inbound_addr:
+ get_param:
+ - ServiceNetMap
+ - str_replace:
+ template: "ROLENAMEHostnameResolveNetwork"
+ params:
+ ROLENAME: {get_param: RoleName}
+ cold_migration_ssh_inbound_addr: {get_param: [ServiceNetMap, NovaApiNetwork]}
tripleo::profile::base::sshd::port:
- 22
- {get_param: MigrationSshPort}