aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-10-10 01:12:03 +0000
committerGerrit Code Review <review@openstack.org>2017-10-10 01:12:03 +0000
commita7ac57e4b9d5a6a82e6826342d9afea88670c710 (patch)
treee23dc9f3e165867ddaeabb1f51dc007dc075f3e8
parentbd2c98f10b48bbe40f0622f9164c608894d19808 (diff)
parent167e3d497c7cbdb687da0063060c4b0aac420558 (diff)
Merge "Fix cold/live migration network config" into stable/pike
-rw-r--r--network/service_net_map.j2.yaml1
-rw-r--r--puppet/services/nova-base.yaml3
-rw-r--r--puppet/services/nova-migration-target.yaml10
3 files changed, 10 insertions, 4 deletions
diff --git a/network/service_net_map.j2.yaml b/network/service_net_map.j2.yaml
index 54646c3..e19ccd8 100644
--- a/network/service_net_map.j2.yaml
+++ b/network/service_net_map.j2.yaml
@@ -55,7 +55,6 @@ parameters:
HeatApiCfnNetwork: internal_api
HeatApiCloudwatchNetwork: internal_api
NovaApiNetwork: internal_api
- NovaColdMigrationNetwork: ctlplane
NovaPlacementNetwork: internal_api
NovaMetadataNetwork: internal_api
NovaVncProxyNetwork: internal_api
diff --git a/puppet/services/nova-base.yaml b/puppet/services/nova-base.yaml
index 08302ee..5539208 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 0c2b419..e121d37 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}