openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix cold/live migration network config"

Browse Source
This commit is contained in:
Jenkins 2017-10-05 17:16:50 +00:00 committed by Gerrit Code Review
commit 7c52feb9a4
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
network/service_net_map.j2.yaml
View File

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

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

@ -159,7 +159,8 @@ outputs:
service_name: nova_base service_name: nova_base
config_settings: config_settings:
map_merge: 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_userid: {get_param: RabbitUserName}
nova::rabbit_use_ssl: {get_param: RabbitClientUseSSL} nova::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
nova::rabbit_port: {get_param: RabbitClientPort} nova::rabbit_port: {get_param: RabbitClientPort}

10
puppet/services/nova-migration-target.yaml
View File

@ -55,8 +55,14 @@ outputs:
tripleo::profile::base::nova::migration::target::ssh_localaddrs: tripleo::profile::base::nova::migration::target::ssh_localaddrs:
- "%{hiera('cold_migration_ssh_inbound_addr')}" - "%{hiera('cold_migration_ssh_inbound_addr')}"
- "%{hiera('live_migration_ssh_inbound_addr')}" - "%{hiera('live_migration_ssh_inbound_addr')}"
live_migration_ssh_inbound_addr: {get_param: [ServiceNetMap, NovaLibvirtNetwork]} live_migration_ssh_inbound_addr:
cold_migration_ssh_inbound_addr: {get_param: [ServiceNetMap, NovaColdMigrationNetwork]} 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: tripleo::profile::base::sshd::port:
- 22 - 22
- {get_param: MigrationSshPort} - {get_param: MigrationSshPort}