From ab068a824ed51e78bf111387223e58e885ec5c84 Mon Sep 17 00:00:00 2001 From: David Moreau Simard Date: Thu, 11 Feb 2016 11:55:54 -0500 Subject: 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 --- puppet/controller.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'puppet/controller.yaml') 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} -- cgit 1.2.3-korg