aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2017-02-12 08:48:15 -0500
committerEmilien Macchi <emilien@redhat.com>2017-02-12 08:48:15 -0500
commit94a0d14f8dd76d5472b04db93b662871e4ba6e33 (patch)
tree8062b5cc04b947734e295ed121f4576135ec0c3e /puppet/services
parentb7c71387bf3a2b5dbe4e7b172b80e92d324e4884 (diff)
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
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/nova-base.yaml1
1 files changed, 1 insertions, 0 deletions
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]}