openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Fix cold/live migration network config 

Cold migration network is determined by the value of my_ip in nova.conf.
If this isn't set then the network with the default gateway will be used.

This patch sets my_ip and the whitelisted IP for cold migation over SSH to the
NovaApiNetwork.

Until https://bugs.launchpad.net/nova/+bug/1671288 is fixed we cannot control
the network used for live migration over SSH. It is determined by hostname
resolution.
This patch sets the whitelisted IP for live migration over SSH to NovaApiNetwork
as it's the same as the hostname resolution network for the role.
(NB The puppet manifest will remove duplicates).

Change-Id: Ica3f79d6d0cfae446e276172146f3a9407f2971f
Depends-On: Id22a6c990f424b9f3ca6159088540ea207460ffd
(cherry picked from commit 23331889a5)
(cherry picked from commit 167e3d497c)
(cherry picked from commit 8ccfee3509)
This commit is contained in:
Oliver Walsh 2017-08-31 00:13:15 +01:00
parent 0616f2d0be
commit 962071deb1
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
network/service_net_map.j2.yaml
View File

@ -44,7 +44,6 @@ parameters:
HeatApiCfnNetwork: internal_api
HeatApiCloudwatchNetwork: internal_api
NovaApiNetwork: internal_api
NovaColdMigrationNetwork: ctlplane
NovaMetadataNetwork: internal_api
NovaVncProxyNetwork: internal_api
NovaLibvirtNetwork: internal_api

1
puppet/services/nova-base.yaml
View File

@ -73,6 +73,7 @@ outputs:
value:
service_name: nova_base
config_settings:
nova::my_ip: {get_param: [ServiceNetMap, NovaApiNetwork]}
nova::rabbit_password: {get_param: RabbitPassword}
nova::rabbit_userid: {get_param: RabbitUserName}
nova::rabbit_use_ssl: {get_param: RabbitClientUseSSL}

4
puppet/services/nova-compute.yaml
View File

@ -118,8 +118,8 @@ outputs:
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]}
live_migration_ssh_inbound_addr: {get_param: [ServiceNetMap, NovaApiNetwork]}
cold_migration_ssh_inbound_addr: {get_param: [ServiceNetMap, NovaApiNetwork]}
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}