diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-02-24 10:07:48 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-02-24 10:07:48 +0000 |
commit | 9e473e4b54197811ede59b07bfb3d0e79475e2e1 (patch) | |
tree | e8c1f2060ae72abc8bd041f4a2391efc75c0eb5c /puppet/compute.yaml | |
parent | 9badd7485b7bcf817c0eeb4a207dd5b6cc2d7dd2 (diff) | |
parent | ab068a824ed51e78bf111387223e58e885ec5c84 (diff) |
Merge "Nova Neutron configuration now uses keystone v3 endpoint"
Diffstat (limited to 'puppet/compute.yaml')
-rw-r--r-- | puppet/compute.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/compute.yaml b/puppet/compute.yaml index 4144c412..1101261e 100644 --- a/puppet/compute.yaml +++ b/puppet/compute.yaml @@ -631,7 +631,7 @@ resources: AGENT_EXTENSIONS: {get_param: NeutronAgentExtensions} neutron_public_interface_raw_device: {get_param: NeutronPublicInterfaceRawDevice} neutron_internal_url: {get_param: [EndpointMap, NeutronInternal, uri]} - neutron_auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri]} + neutron_auth_url: {get_param: [EndpointMap, KeystoneV3Admin, uri]} keystone_vip: {get_param: KeystonePublicApiVirtualIP} admin_password: {get_param: AdminPassword} rabbit_username: {get_param: RabbitUserName} |