From 927353ddf53103564737d0bf06d254564ee0eba0 Mon Sep 17 00:00:00 2001 From: Risto Laurikainen Date: Wed, 18 Feb 2015 14:07:36 +0000 Subject: [PATCH] Fix catalog compilation when not configuring endpoint Previously when you set $configure_endpoint to false and did not have a keystone_endpoint resource with the same name as is defined by nova::keystone::auth, the catalog would not be compiled. This was because a relationship was being established where one resource in the relationship didn't exist. This changes this so that the relationship involving the Keystone endpoint is only defined if $configure_endpoint is set to true. Change-Id: Ief2ea40d0e4f31e18ba4b1230c5879909a1cfe46 Closes-Bug: 1368686 --- manifests/keystone/auth.pp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp index 4be745b23..7d795699a 100644 --- a/manifests/keystone/auth.pp +++ b/manifests/keystone/auth.pp @@ -132,7 +132,9 @@ class nova::keystone::auth( fail('nova::keystone::auth parameters service_name and service_name_v3 must be different.') } - Keystone_endpoint["${region}/${real_service_name}"] ~> Service <| name == 'nova-api' |> + if $configure_endpoint { + Keystone_endpoint["${region}/${real_service_name}"] ~> Service <| name == 'nova-api' |> + } keystone::resource::service_identity { "nova service, user ${auth_name}": configure_user => $configure_user,