aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services/nova-base.yaml
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 /puppet/services/nova-base.yaml
parentbd2c98f10b48bbe40f0622f9164c608894d19808 (diff)
parent167e3d497c7cbdb687da0063060c4b0aac420558 (diff)
Merge "Fix cold/live migration network config" into stable/pike
Diffstat (limited to 'puppet/services/nova-base.yaml')
-rw-r--r--puppet/services/nova-base.yaml3
1 files changed, 2 insertions, 1 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}