diff options
| author |   David Moreau Simard <dms@redhat.com> | 2016-02-11 11:55:54 -0500 |
|---|---|---|
| committer |   John Trowbridge <trown@redhat.com> | 2016-02-23 08:26:27 -0500 |
| commit | ab068a824ed51e78bf111387223e58e885ec5c84 (patch) | |
| tree | f69ecd208b384e4d7509d9b404659799555c9158 /puppet | |
| parent | 8c6943e898453b3e6fb05c1d238301bdb7d0fef5 (diff) | |
Nova Neutron configuration now uses keystone v3 endpoint
Our current nova-neutron configuration does not work with
the latest puppet-nova. In particular, this patch[1].
This commit adds keystone v3 endpoints to the map and gets the
nova::network::neutron configuration to use them.
[1] https://github.com/openstack/puppet-nova/commit/d09868a59c451932d67c66101b725182d7066a14
Change-Id: Ifb8c23c81c665c2732fa5cd757760668b06a449a
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 360eb58d..d30e9a0b 100644 --- a/puppet/compute.yaml +++ b/puppet/compute.yaml @@ -624,7 +624,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} |