diff options
| author |   Oliver Walsh <owalsh@redhat.com> | 2017-08-31 00:13:15 +0100 |
|---|---|---|
| committer | Oliver Walsh <owalsh@redhat.com> | 2017-10-09 12:24:03 +0100 |
| commit | 167e3d497c7cbdb687da0063060c4b0aac420558 (patch) | |
| tree | 0cf6b095f20fb02cb93bb7d5f3d0eb8b3cec66ee /puppet/services | |
| parent | 6fea40f786a466802503c03b2b815d05676e1807 (diff) | |
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 the hostname
resolution network for the role - which is typically the same as NovaApiNetwork.
(NB The puppet manifest will remove duplicates).
Live migration over TLS is not affected. It can control the network used so it
configurable via NovaLibvirtNetwork.
Change-Id: Ica3f79d6d0cfae446e276172146f3a9407f2971f
Depends-On: Id22a6c990f424b9f3ca6159088540ea207460ffd
(cherry picked from commit 23331889a577b82b625610a80ecd44e164fe6cf1)
Diffstat (limited to 'puppet/services')
| -rw-r--r-- | puppet/services/nova-base.yaml | 3 | ||||
| -rw-r--r-- | puppet/services/nova-migration-target.yaml | 10 |
2 files changed, 10 insertions, 3 deletions
diff --git a/puppet/services/nova-base.yaml b/puppet/services/nova-base.yaml index 08302ee9..55392086 100644 --- a/puppet/services/nova-base.yaml +++ b/puppet/services/nova-base.yaml @@ -159,7 +159,8 @@ outputs: service_name: nova_base config_settings: map_merge: - - nova::rabbit_password: {get_param: RabbitPassword} + - 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} nova::rabbit_port: {get_param: RabbitClientPort} 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} |