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 | |
| parent | 9badd7485b7bcf817c0eeb4a207dd5b6cc2d7dd2 (diff) | |
| parent | ab068a824ed51e78bf111387223e58e885ec5c84 (diff) | |
Merge "Nova Neutron configuration now uses keystone v3 endpoint"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/compute.yaml | 2 | ||||
| -rw-r--r-- | puppet/controller.yaml | 2 |
2 files changed, 2 insertions, 2 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} diff --git a/puppet/controller.yaml b/puppet/controller.yaml index f2068d83..51c9b6c0 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -1083,7 +1083,7 @@ resources: neutron_internal_url: { get_param: [ EndpointMap, NeutronInternal, uri ] } neutron_public_url: { get_param: [ EndpointMap, NeutronPublic, uri ] } neutron_admin_url: { get_param: [ EndpointMap, NeutronAdmin, uri ] } - neutron_auth_url: { get_param: [ EndpointMap, KeystoneAdmin, uri_no_suffix ] } + neutron_auth_url: { get_param: [ EndpointMap, KeystoneV3Admin, uri ] } nova_internal_url: { get_param: [ EndpointMap, NovaInternal, uri ] } ceilometer_backend: {get_param: CeilometerBackend} ceilometer_metering_secret: {get_param: CeilometerMeteringSecret} |