aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-05 23:17:37 +0000
committerGerrit Code Review <review@openstack.org>2017-06-05 23:17:37 +0000
commit19e86b3bef7164ef4b15a28683e8e2c0165c9625 (patch)
treea24d639f79714193398f2650c42038ad3b319fb8 /puppet
parentba1dfb216907384ef13b826124b9ff0387a9aefe (diff)
parent558f8e53ad1e394c468a1ed429139d6eae6e928c (diff)
Merge "Restrict nova migration ssh tunnel" into stable/ocata
Diffstat (limited to 'puppet')
-rw-r--r--puppet/services/nova-compute.yaml5
1 files changed, 5 insertions, 0 deletions
diff --git a/puppet/services/nova-compute.yaml b/puppet/services/nova-compute.yaml
index b1711436..d608dc28 100644
--- a/puppet/services/nova-compute.yaml
+++ b/puppet/services/nova-compute.yaml
@@ -119,6 +119,11 @@ outputs:
nova::compute::libvirt::migration_support: false
tripleo::profile::base::nova::manage_migration: true
tripleo::profile::base::nova::migration_ssh_key: {get_param: MigrationSshKey}
+ tripleo::profile::base::nova::migration_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]}
tripleo::profile::base::nova::nova_compute_enabled: true
nova::compute::rbd::libvirt_images_rbd_pool: {get_param: NovaRbdPoolName}
nova::compute::rbd::libvirt_rbd_user: {get_param: CephClientUserName}