From: Emilien Macchi <emilien@redhat.com>
Date: Sun, 12 Feb 2017 13:48:15 +0000 (-0500)
Subject: Fix Neutron region in nova.conf
X-Git-Tag: opnfv-6.0.0~1095^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=94a0d14f8dd76d5472b04db93b662871e4ba6e33;p=apex-tripleo-heat-templates.git

Fix Neutron region in nova.conf

Default in puppet-neutron is 'RegionOne', so let's override it with the
right parameter in TripleO.

Change-Id: I3f1693b91178027c8e05288aeba72b7d6bd042be
---

diff --git a/puppet/services/nova-base.yaml b/puppet/services/nova-base.yaml
index 49cba79c..d6190be8 100644
--- a/puppet/services/nova-base.yaml
+++ b/puppet/services/nova-base.yaml
@@ -167,6 +167,7 @@ outputs:
           nova::purge_config: {get_param: EnableConfigPurge}
           nova::network::neutron::neutron_project_name: 'service'
           nova::network::neutron::neutron_username: 'neutron'
+          nova::network::neutron::neutron_region_name: {get_param: KeystoneRegion}
           nova::network::neutron::dhcp_domain: ''
           nova::network::neutron::neutron_password: {get_param: NeutronPassword}
           nova::network::neutron::neutron_url: {get_param: [EndpointMap, NeutronInternal, uri]}