summaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-05-04 23:05:09 +0000
committerGerrit Code Review <review@openstack.org>2017-05-04 23:05:10 +0000
commit984a9e7fabf7a26bd71184f7f74ae0953fbc5239 (patch)
tree702abbecc85ace6139eed83eb9c9fb71b6135c13 /puppet/services
parent14ae871745779eadf87c630e40717acf37a92023 (diff)
parent3d8af2fcf8e2d41600fa10584120a8117e7ef40c (diff)
Merge "Restrict nova migration ssh tunnel"
Diffstat (limited to 'puppet/services')
-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}