From 962071deb14d39ec7fb0784039ffe88750b6bd1f Mon Sep 17 00:00:00 2001 From: Oliver Walsh Date: Thu, 31 Aug 2017 00:13:15 +0100 Subject: [PATCH] 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 23331889a577b82b625610a80ecd44e164fe6cf1) (cherry picked from commit 167e3d497c7cbdb687da0063060c4b0aac420558) (cherry picked from commit 8ccfee3509a66525c0d739c18669dd1bf09b4244) --- network/service_net_map.j2.yaml | 1 - puppet/services/nova-base.yaml | 1 + puppet/services/nova-compute.yaml | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/network/service_net_map.j2.yaml b/network/service_net_map.j2.yaml index 5b5f1f4b9d..3a6cb02e80 100644 --- a/network/service_net_map.j2.yaml +++ b/network/service_net_map.j2.yaml @@ -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 diff --git a/puppet/services/nova-base.yaml b/puppet/services/nova-base.yaml index a9736c8bb9..cf005445e4 100644 --- a/puppet/services/nova-base.yaml +++ b/puppet/services/nova-base.yaml @@ -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} diff --git a/puppet/services/nova-compute.yaml b/puppet/services/nova-compute.yaml index 5a622065ec..1ba47fc855 100644 --- a/puppet/services/nova-compute.yaml +++ b/puppet/services/nova-compute.yaml @@ -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}