diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-02-13 14:05:52 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-02-13 14:05:52 +0000 |
| commit | efdb1461d2704e00e3a9fb39fecb1c8144c682b6 (patch) | |
| tree | f6e2818b720114d65605245d266a41667a437877 /puppet | |
| parent | d56aa7a2df50926ca8e79b9d51211a5db0e55536 (diff) | |
| parent | 94a0d14f8dd76d5472b04db93b662871e4ba6e33 (diff) | |
Merge "Fix Neutron region in nova.conf"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/services/nova-base.yaml | 1 |
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]} |